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

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

Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c3 am:... 

Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c3 am: 83cd3636 am: 7a1cca44

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



Change-Id: I32e8c53f9dfd4f7e2dd5edccaf118fec9a513f36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2b968ec 7a1cca44

envsetup.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -1744,7 +1744,7 @@ function b() 
    local skip_tests=$(echo "$@" | grep -ow -- "--skip-soong-tests")

    local skip_tests=$(echo "$@" | grep -ow -- "--skip-soong-tests")

    local bazel_args=(${@/--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= $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 "$bazel_args" ]]; then

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

        # If there are no args, show help.

        # If there are no args, show help.