commit 34d60c9281a127d1ff5e9cf0d585a2d795acbcf6
author Colin Cross <ccross@android.com> Thu Oct 28 16:19:40 2021 -0700
committer Colin Cross <ccross@android.com> Fri Oct 29 16:34:55 2021 -0700
tree ca03135cb9ffe54a915da0a38d165608f58e6bbc
parent 1bc9412fb3de9b6e548c2938fa762a990c14a0d2

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: build/soong/tests/run_integration_tests.sh
Test: build/soong/scripts/build-mainline-modules.sh
Test: build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I629ee7542687aaafd68eea50346b0cf53eafe1ef

scripts/build-ndk-prebuilts.sh

diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh
index a1fa48d..4783037 100755
--- a/scripts/build-ndk-prebuilts.sh
+++ b/scripts/build-ndk-prebuilts.sh
@@ -64,7 +64,7 @@
     "MissingUsesLibraries": ${MISSING_USES_LIBRARIES}
 }
 EOF
-m --skip-make ${SOONG_OUT}/ndk.timestamp
+m --soong-only --skip-config ${SOONG_OUT}/ndk.timestamp
 
 if [ -n "${DIST_DIR}" ]; then
     mkdir -p ${DIST_DIR} || true