Enable TARGET_BUILD_UNBUNDLED in master-art (reland).
This is the way to disable assumptions in the build system that a full
system image is to be built.
Soong internally checks for the absence of frameworks/base to detect a
reduced master-art tree and disable some dependencies. That check is at
odds with TARGET_BUILD_UNBUNDLED=true, so for now let's enable
TARGET_BUILD_UNBUNDLED only on the same condition.
This relands https://r.android.com/1337182 with changes in two
testrunner scripts that were missed.
Test: art/tools/buildbot-build.sh --host
on AOSP master and master-art
Test: art/tools/buildbot-build.sh --target
on AOSP master and master-art
Test: m installclean && art/build/apex/runtests.sh
on AOSP master and master-art
Test: rm -rf out && \
art/test/testrunner/run_build_test_target.py art-linux-bionic-x64
on AOSP master and master-art
Test: art/test/testrunner/run_build_test_target.py art-test
on AOSP master and master-art
Test: art/test/testrunner/testrunner.py --target --64 --optimizing && \
art/tools/run-gtests.sh
in test chroot on device
on AOSP master and master-art
Test: art/tools/golem/build-target.sh \
--machine-type=android-armv8 --golem=art-jit
on AOSP master and master-art
Bug: 159109002
Bug: 157549171
Change-Id: Ie98af1098ea1132d3db7ed0a8bf47b54e0848e57
diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh
index c834dd5..a761325 100755
--- a/tools/build_linux_bionic_tests.sh
+++ b/tools/build_linux_bionic_tests.sh
@@ -26,6 +26,14 @@
exit 1
fi
+soong_args=""
+
+# Switch the build system to unbundled mode in the reduced manifest branch.
+# TODO(b/159109002): Clean this up.
+if [ ! -d frameworks/base ]; then
+ soong_args="$soong_args TARGET_BUILD_UNBUNDLED=true"
+fi
+
source build/envsetup.sh >&/dev/null # for get_build_var
out_dir=$(get_build_var OUT_DIR)
@@ -38,7 +46,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 "$@" test-art-host-run-test-dependencies build-art-host-tests
+build/soong/soong_ui.bash --make-mode $soong_args "$@" test-art-host-run-test-dependencies build-art-host-tests
if [ $? != 0 ]; then
exit 1
fi
@@ -88,7 +96,7 @@
echo building ${bionic_targets[*]}
-build/soong/soong_ui.bash --make-mode --skip-make "$@" ${bionic_targets[*]}
+build/soong/soong_ui.bash --make-mode --skip-make $soong_args "$@" ${bionic_targets[*]}
ret=$?
mv $tmp_soong_var $out_dir/soong/soong.variables