Merge "add flag to skip soong tests for b command" am: 375dd60d5a am: 9244deabb0

Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: Ia62bc9642e7f2d2a688a19e5ca166987acb36057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-03-30 20:20:13 +00:00 committed by Automerger Merge Worker
commit 6fa65aef1c

View file

@ -1737,15 +1737,17 @@ function _trigger_build()
# Convenience entry point (like m) to use Bazel in AOSP.
function b()
(
local skip_tests=$(echo "$@" | grep -ow -- "--skip-soong-tests")
local bazel_args=(${@/--skip-soong-tests/})
# 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.
if [[ -z "$@" ]]; then
if [[ -z "$bazel_args" ]]; then
# If there are no args, show help.
bazel help
else
# Else, always run with the bp2build configuration, which sets Bazel's package path to the synthetic workspace.
bazel "$@" --config=bp2build
bazel $bazel_args --config=bp2build
fi
)