diff options
-rw-r--r-- | build-scripts/build-android | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 0b6a894..6b4c596 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -81,6 +81,8 @@ else . build/envsetup.sh trap infrastructure_error ERR + [ -n "$LUNCH" ] && lunch "$LUNCH" + # We evaluate the configuration again because envsetup.sh might well # have stomped on some of the values in it. @@ -129,7 +131,7 @@ else cp $toolchain_filename fingerprints/ fi - if test -z "$TARGET_ARCH_VARIANT"; then + if test -z "$TARGET_ARCH_VARIANT" -a -z "$LUNCH"; then TARGET_ARCH_VARIANT=armv7-a-neon fi if test -z "$WITH_HOST_DALVIK"; then |