aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2019-03-12 19:23:46 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2019-03-12 19:26:52 +0800
commit8647692a2ea9913e07c58d153125c1e53a030b34 (patch)
treee359164ac302a10fdb7bf39bebd9b35681563dc4
parentb3eec248b7a5778f7ea7df0718058d8df5c6bd46 (diff)
downloadlinaro-android-build-tools-master.tar.gz
build-android: remove the setting on WITH_HOST_DALVIKHEADmaster
remove the default value settings for WITH_HOST_DALVIK in this building script, make the android building system use the default value of WITH_HOST_DALVIK set in aosp Otherwise it would could building error like reported here: https://ci.linaro.org/job/android-lcr-reference-x15-master/48/console when WITH_HOST_DALVIK is not set explicitly for the build Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I38d318cfdb23c81187aa4b445ebfe719d1dcbcdd
-rw-r--r--build-scripts/build-android5
1 files changed, 1 insertions, 4 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android
index 69ecd64..f1cd367 100644
--- a/build-scripts/build-android
+++ b/build-scripts/build-android
@@ -176,9 +176,6 @@ else
if test -z "$TARGET_ARCH_VARIANT" -a -z "$LUNCH"; then
TARGET_ARCH_VARIANT=armv7-a-neon
fi
- if test -z "$WITH_HOST_DALVIK"; then
- WITH_HOST_DALVIK=false
- fi
SHOWCOMMANDS=
if ! test -z "$QUIET" && test "$QUIET" = "1"; then
@@ -239,7 +236,7 @@ else
trap - ERR
export TIMEFORMAT="TIME: Compilation: %lR"
- time $MAKE $MAKE_OPTS -j$MAKE_JOBS $MAKE_TARGETS $SHOWCOMMANDS WITH_HOST_DALVIK="$WITH_HOST_DALVIK" USE_CLANG_PLATFORM_BUILD="$USE_CLANG_PLATFORM_BUILD"
+ time $MAKE $MAKE_OPTS -j$MAKE_JOBS $MAKE_TARGETS $SHOWCOMMANDS USE_CLANG_PLATFORM_BUILD="$USE_CLANG_PLATFORM_BUILD"
unset TIMEFORMAT
trap infrastructure_error ERR