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
diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh
index 3c5a68f..8992512 100755
--- a/tools/build_linux_bionic.sh
+++ b/tools/build_linux_bionic.sh
@@ -32,7 +32,7 @@
fi
# TODO(b/194433871): Set MODULE_BUILD_FROM_SOURCE to disable prebuilt modules,
-# which Soong otherwise can create duplicate install rules for in --skip-make
+# which Soong otherwise can create duplicate install rules for in --soong-only
# mode.
soong_args="MODULE_BUILD_FROM_SOURCE=true"
@@ -95,4 +95,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-config --soong-only $soong_args $@