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

skip soong tests by default for b command

Browse source 
It doesn't really make sense to incur the cost of running Soong tests to
Bazel users. We can shave off 20 seconds from the local critical path
during clean builds (or if Soong itself has changed) by enabling
--skip-soong-tests in the b command.

Test: b build '...'
Test: b build '...' --run-soong-tests
Bug: 240231596
Change-Id: I77d652502dc000908166e13045aa3e245c2e762c
This commit is contained in:
Sam Delmerico 2022-08-25 12:31:05 -04:00
parent aa6a6a4f36
commit 56e576dc12
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
envsetup.sh
View file

@ -1838,10 +1838,17 @@ function _trigger_build()
# Convenience entry point (like m) to use Bazel in AOSP. # Convenience entry point (like m) to use Bazel in AOSP.
function b() function b()
( (
# Look for the --run-soong-tests flag and skip passing --skip-soong-tests to Soong if present
local run_tests=$(echo "$@" | grep -ow -- "--run-soong-tests")
local bazel_args=(${@/--run-soong-tests})
local skip_tests="--skip-soong-tests"
if [[ -n $run_tests ]]; then
skip_tests=""
fi
# Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace). # Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace).
_trigger_build "all-modules" bp2build USE_BAZEL_ANALYSIS= || return 1 _trigger_build "all-modules" bp2build USE_BAZEL_ANALYSIS= $skip_tests || return 1
# Then, run Bazel using the synthetic workspace as the --package_path. # Then, run Bazel using the synthetic workspace as the --package_path.
if [[ -z "$@" ]]; then if [[ -z "$bazel_args" ]]; then
# If there are no args, show help. # If there are no args, show help.
bazel help bazel help
else else
@ -1849,17 +1856,23 @@ function b()
# Add the --config=bp2build after the first argument that doesn't start with a dash. That should be the bazel # Add the --config=bp2build after the first argument that doesn't start with a dash. That should be the bazel
# command. (build, test, run, ect) If the --config was added at the end, it wouldn't work with commands like: # command. (build, test, run, ect) If the --config was added at the end, it wouldn't work with commands like:
# b run //foo -- --args-for-foo # b run //foo -- --args-for-foo
local previous_args="" local pre_config_args=""
for arg in $@; local post_config_args=""
local start_post_config_args=0
for arg in $bazel_args;
do do
previous_args+="$arg " if [[ $start_post_config_args -eq 0 ]]; then
shift pre_config_args+="$arg "
else
post_config_args+="$arg "
fi
if [[ $arg != -* ]]; # if $arg doesn't start with a dash if [[ $arg != -* ]]; # if $arg doesn't start with a dash
then then
break start_post_config_args=1
fi fi
done done
bazel $previous_args --config=bp2build $@ eval "bazel $pre_config_args --config=bp2build $post_config_args"
fi fi
) )