Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109 Change-Id: I654dd587a07486f03d8ab1aa761c1f972e3fada1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
83cd363614
|
@ -1740,7 +1740,7 @@ 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= "$skip_tests" || 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 "$bazel_args" ]]; then
|
||||
# If there are no args, show help.
|
||||
|
|
Loading…
Reference in New Issue