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

Commit 19245942 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "Disable USE_RBE with b builds (m bp2build)." am: a45c1be9 

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



Change-Id: Ic075e85054e0aab4449aa675bbf0ef8c543bebcd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0768020 a45c1be9

envsetup.sh

+3 −1
Original line number Diff line number Diff line
@@ -1821,8 +1821,10 @@ function b() 
            skip_tests=""

        fi

    done



    # Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace).

    _trigger_build "all-modules" bp2build $skip_tests USE_BAZEL_ANALYSIS= || return 1

    # RBE is disabled because it's not used with b builds and adds overhead: b/251441524

    USE_RBE=false _trigger_build "all-modules" bp2build $skip_tests USE_BAZEL_ANALYSIS= || 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 and exit.