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

revert addition of --skip-soong-test flag

Browse Source 
aosp/2045666 attempted to permit passing the `--skip-soong-tests` flag
through the `b` command to `soong_ui`, but it has been causing problems.

Test: b build '...' --skip-soong-tests is not recognized
Test: build/bazel/ci/bp2build.sh
Change-Id: I02487841d8081218dc941cb04bfa1a9e148ab6af
This commit is contained in:
Sam Delmerico
2022-04-11 12:25:18 +00:00
parent 9d1b28ed10
commit 9d67a905b7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
envsetup.sh
View File

@@ -1782,17 +1782,15 @@ 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()
( (
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). # 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= || 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 "$bazel_args" ]]; then if [[ -z "$@" ]]; then
# If there are no args, show help. # If there are no args, show help.
bazel help bazel help
else else
# Else, always run with the bp2build configuration, which sets Bazel's package path to the synthetic workspace. # Else, always run with the bp2build configuration, which sets Bazel's package path to the synthetic workspace.
bazel $bazel_args --config=bp2build bazel "$@" --config=bp2build
fi fi
) )