From 992f04cb1b37eac50b0aa035e75a5a8df618b71c Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Fri, 17 Oct 2014 08:01:25 +0200 Subject: Add a hook for running lunch Add a hook for running lunch to do builds AOSP style. Don't set TARGET_ARCH_VARIANT if lunch is being used (lunch takes care of that). Change-Id: Icf6caefd3ed53761a76ef3977480d9254f1e7c15 Signed-off-by: Bernhard Rosenkraenzer --- build-scripts/build-android | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3