commit 0a42f1e85d989476c1be2acb5615ca61a1c0f65a
author Colin Cross <ccross@android.com> Thu Oct 28 16:31:03 2021 -0700
committer Colin Cross <ccross@android.com> Fri Oct 29 15:43:15 2021 +0000
tree 1e4e07bfa9d68bce1e455fa6ded41cd89aa235d9
parent 8cb989f1019c4fa30845bf2deb5bc996ed4e8966

Use --skip-config --soong-only instead of --skip-make

--skip-make is deprecated because of its odd behavior around the
out/.soong.kati_enabled file.  Replace it with --skip-config --soong-only
instead, which will unambigiously skip running kati.

Bug: 204136549
Test: art/build/build-art-module.sh
Test: art/tools/build_linux_bionic.sh
Test: art/tools/build_linux_bionic_tests.sh
Change-Id: If62bc03b89265d68b3927636f2be19296ee424bc

tools/build_linux_bionic_tests.sh

diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh
index 73596ad..7379e9a 100755
--- a/tools/build_linux_bionic_tests.sh
+++ b/tools/build_linux_bionic_tests.sh
@@ -95,7 +95,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-config --soong-only $soong_args "$@" ${bionic_targets[*]}
 ret=$?
 
 mv $tmp_soong_var $out_dir/soong/soong.variables