Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit def5eefb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "revert addition of --skip-soong-test flag" am: 9bc50689 am: 3cbef527 

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



Change-Id: I89a5e5ed3b1f26ce082ebfb412682446af3c0812
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28c7f408 3cbef527

envsetup.sh

+3 −5
Original line number Diff line number Diff line
@@ -1792,17 +1792,15 @@ 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= $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.

    if [[ -z "$bazel_args" ]]; then

    if [[ -z "$@" ]]; 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 $bazel_args --config=bp2build

        bazel "$@" --config=bp2build

    fi

)