StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "skip soong tests by default for b command" am: 1eb2dc871c am: 2661c5f818

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2197295

Change-Id: I01f23ae1dd1ed5a4220a108c7c407ab5b3c9b506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-30 01:24:05 +00:00
committed by Automerger Merge Worker
parent befa9f51d3 2661c5f818
commit 0d92b73705
1 changed files with 21 additions and 8 deletions
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
) )