From 141d63dcd9406866c741220ead879c3064b5f91c Mon Sep 17 00:00:00 2001
From: Jingwen Chen <jingwen@google.com>
Date: Thu, 6 Oct 2022 15:26:58 +0000
Subject: [PATCH] Disable USE_RBE with b builds (m bp2build).

RBE is not used with standalone builds, and it adds unnecessary
overhead.

Test: without this change, b info no-op takes 24s on my machine. with
this change, it drops to 9s.

Fixes: 251441524
Bug: 243596580
Change-Id: I564629064f51e2b2cad836915aacf6f72e84aaeb
---
 envsetup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/envsetup.sh b/envsetup.sh
index 8b0865dc8c..74d57c25c5 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -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.