tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use --skip-config --soong-only instead of --skip-make

Browse source 
--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:
Colin Cross 2021-10-28 16:19:40 -07:00
parent 1bc9412fb3
commit 34d60c9281
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.bash
View file

@ -15,9 +15,9 @@
# limitations under the License. # limitations under the License.
echo '==== ERROR: bootstrap.bash & ./soong are obsolete ====' >&2 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 '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 echo '======================================================' >&2
exit 1 exit 1

4
scripts/build-aml-prebuilts.sh
View file

@ -23,10 +23,10 @@ fi
export OUT_DIR=${OUT_DIR:-out} export OUT_DIR=${OUT_DIR:-out}
if [ -e ${OUT_DIR}/soong/.soong.kati_enabled ]; then if [ -e ${OUT_DIR}/soong/.soong.kati_enabled ]; then
# If ${OUT_DIR} has been created without --skip-make, Soong will create an # If ${OUT_DIR} has been created without --soong-only, Soong will create an
# ${OUT_DIR}/soong/build.ninja that leaves out many targets which are # ${OUT_DIR}/soong/build.ninja that leaves out many targets which are
# expected to be supplied by the .mk files, and that might cause errors in # expected to be supplied by the .mk files, and that might cause errors in
# "m --skip-make" below. We therefore default to a different out dir # "m --soong-only" below. We therefore default to a different out dir
# location in that case. # location in that case.
AML_OUT_DIR=out/aml AML_OUT_DIR=out/aml
echo "Avoiding in-make OUT_DIR '${OUT_DIR}' - building in '${AML_OUT_DIR}' instead" echo "Avoiding in-make OUT_DIR '${OUT_DIR}' - building in '${AML_OUT_DIR}' instead"

2
scripts/build-mainline-modules.sh
View file

@ -99,7 +99,7 @@ done
export FORCE_BUILD_LLVM_COMPONENTS=true export FORCE_BUILD_LLVM_COMPONENTS=true
# Create multi-archs SDKs in a different out directory. The multi-arch script # 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. # mode with make.
export OUT_DIR=${OUT_DIR}/aml export OUT_DIR=${OUT_DIR}/aml
echo_and_run build/soong/scripts/build-aml-prebuilts.sh \ echo_and_run build/soong/scripts/build-aml-prebuilts.sh \

2
scripts/build-ndk-prebuilts.sh
View file

@ -64,7 +64,7 @@ cat > ${SOONG_OUT}/soong.variables << EOF
"MissingUsesLibraries": ${MISSING_USES_LIBRARIES} "MissingUsesLibraries": ${MISSING_USES_LIBRARIES}
} }
EOF EOF
m --skip-make ${SOONG_OUT}/ndk.timestamp m --soong-only --skip-config ${SOONG_OUT}/ndk.timestamp
if [ -n "${DIST_DIR}" ]; then if [ -n "${DIST_DIR}" ]; then
mkdir -p ${DIST_DIR} || true mkdir -p ${DIST_DIR} || true

4
soong.bash
View file

@ -15,8 +15,8 @@
# limitations under the License. # limitations under the License.
echo '==== ERROR: bootstrap.bash & ./soong are obsolete ====' >&2 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 '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 echo '======================================================' >&2
exit 1 exit 1

4
tests/lib.sh
View file

@ -105,7 +105,7 @@ function setup() {
} }
function run_soong() { function run_soong() {
build/soong/soong_ui.bash --make-mode --skip-ninja --skip-make --skip-soong-tests "$@" build/soong/soong_ui.bash --make-mode --skip-ninja --skip-config --soong-only --skip-soong-tests "$@"
} }
function create_mock_bazel() { function create_mock_bazel() {
@ -125,7 +125,7 @@ run_bazel() {
} }
run_ninja() { run_ninja() {
build/soong/soong_ui.bash --make-mode --skip-make --skip-soong-tests "$@" build/soong/soong_ui.bash --make-mode --skip-config --soong-only --skip-soong-tests "$@"
} }
info "Starting Soong integration test suite $(basename $0)" info "Starting Soong integration test suite $(basename $0)"