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
This commit is contained in:
@@ -99,7 +99,7 @@ done
|
||||
export FORCE_BUILD_LLVM_COMPONENTS=true
|
||||
|
||||
# Create multi-archs SDKs in a different out directory. The multi-arch script
|
||||
# uses Soong in --skip-make mode which cannot use the same directory as normal
|
||||
# uses Soong in --soong-only mode which cannot use the same directory as normal
|
||||
# mode with make.
|
||||
export OUT_DIR=${OUT_DIR}/aml
|
||||
echo_and_run build/soong/scripts/build-aml-prebuilts.sh \
|
||||
|
Reference in New Issue
Block a user