Revert "Use TARGET_BUILD_UNBUNDLED in ART test builds."
This reverts the remaining bits of https://r.android.com/1324611. It's
known to cause duplicate make modules in some cases when sdk_version is
specified.
Test: TH
Bug: 157549171
Change-Id: Ia27a6415886820f67582eef791d2e4d4ca172527
diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh
index 5dc38e2..89e72b2 100755
--- a/tools/build_linux_bionic.sh
+++ b/tools/build_linux_bionic.sh
@@ -31,15 +31,13 @@
exit 1
fi
-soong_args="TARGET_BUILD_UNBUNDLED=true"
-
source build/envsetup.sh >&/dev/null # for get_build_var
# Soong needs a bunch of variables set and will not run if they are missing.
# The default values of these variables is only contained in make, so use
# nothing to create the variables then remove all the other artifacts.
# Lunch since it seems we cannot find the build-number otherwise.
lunch aosp_x86-eng
-build/soong/soong_ui.bash --make-mode $soong_args nothing
+build/soong/soong_ui.bash --make-mode nothing
if [ $? != 0 ]; then
exit 1
@@ -88,4 +86,4 @@
# Write a new build-number
echo ${tmp_build_number}_SOONG_ONLY_BUILD > ${out_dir}/soong/build_number.txt
-build/soong/soong_ui.bash --make-mode --skip-make $soong_args $@
+build/soong/soong_ui.bash --make-mode --skip-make $@
diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh
index 2c1084c..c834dd5 100755
--- a/tools/build_linux_bionic_tests.sh
+++ b/tools/build_linux_bionic_tests.sh
@@ -26,8 +26,6 @@
exit 1
fi
-soong_args="TARGET_BUILD_UNBUNDLED=true"
-
source build/envsetup.sh >&/dev/null # for get_build_var
out_dir=$(get_build_var OUT_DIR)
@@ -40,7 +38,7 @@
# First build all the targets still in .mk files (also build normal glibc host
# targets so we know what's needed to run the tests).
-build/soong/soong_ui.bash --make-mode $soong_args "$@" test-art-host-run-test-dependencies build-art-host-tests
+build/soong/soong_ui.bash --make-mode "$@" test-art-host-run-test-dependencies build-art-host-tests
if [ $? != 0 ]; then
exit 1
fi
@@ -90,7 +88,7 @@
echo building ${bionic_targets[*]}
-build/soong/soong_ui.bash --make-mode --skip-make $soong_args "$@" ${bionic_targets[*]}
+build/soong/soong_ui.bash --make-mode --skip-make "$@" ${bionic_targets[*]}
ret=$?
mv $tmp_soong_var $out_dir/soong/soong.variables
diff --git a/tools/golem/build-target.sh b/tools/golem/build-target.sh
index 3219cc2..45c9125 100755
--- a/tools/golem/build-target.sh
+++ b/tools/golem/build-target.sh
@@ -269,8 +269,6 @@
execute lunch "$lunch_target"
# Golem uses master-art repository which is missing a lot of other libraries.
setenv SOONG_ALLOW_MISSING_DEPENDENCIES true
- # Let the build system know we're not aiming to do a full platform build.
- setenv TARGET_BUILD_UNBUNDLED true
# Golem may be missing tools such as javac from its path.
setenv_escape PATH "/usr/lib/jvm/java-8-openjdk-amd64/bin/:$PATH" '/usr/lib/jvm/java-8-openjdk-amd64/bin/:$PATH'
else