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: prebuilts/build-tools/build-tools-kzip.sh
Change-Id: I7f5aa9ef2bccf74ddac7963c421d49a76c606b6e
diff --git a/build-tools-kzip.sh b/build-tools-kzip.sh
index fa4f7a4..387447b 100755
--- a/build-tools-kzip.sh
+++ b/build-tools-kzip.sh
@@ -28,7 +28,7 @@
# Some of targets will fail because of the missing references, but there
# will be sufficient number of successfully compiled modules.
-XREF_CORPUS="${corpus}" build/soong/soong_ui.bash --make-mode --skip-make -k xref_java xref_cxx || echo Ignoring errors
+XREF_CORPUS="${corpus}" build/soong/soong_ui.bash --make-mode --skip-config --soong-only -k xref_java xref_cxx || echo Ignoring errors
# Package it all into a single .kzip, ignoring duplicates.
allkzip=$(realpath "${OUT_DIR}/all.kzip")