diff options
| author | 2021-10-28 16:19:40 -0700 | |
|---|---|---|
| committer | 2021-10-29 16:34:55 -0700 | |
| commit | 34d60c9281a127d1ff5e9cf0d585a2d795acbcf6 (patch) | |
| tree | ca03135cb9ffe54a915da0a38d165608f58e6bbc /soong.bash | |
| parent | 1bc9412fb3de9b6e548c2938fa762a990c14a0d2 (diff) | |
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
Diffstat (limited to 'soong.bash')
| -rwxr-xr-x | soong.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soong.bash b/soong.bash index 8cf2ec68c..db7af7c47 100755 --- a/soong.bash +++ b/soong.bash @@ -15,8 +15,8 @@ # limitations under the License. echo '==== ERROR: bootstrap.bash & ./soong are obsolete ====' >&2 -echo 'Use `m --skip-make` with a standalone OUT_DIR instead.' >&2 +echo 'Use `m --soong-only` with a standalone OUT_DIR instead.' >&2 echo 'Without envsetup.sh, use:' >&2 -echo ' build/soong/soong_ui.bash --make-mode --skip-make' >&2 +echo ' build/soong/soong_ui.bash --make-mode --soong-only' >&2 echo '======================================================' >&2 exit 1 |