Merge "Add the ability to source RBE related scripts from envsetup.sh" am: 10935cf315 am: 85382dcfec am: 955e561ffa am: 1023e9f615

Original change: https://android-review.googlesource.com/c/platform/build/+/1763565 Change-Id: I2bd1d35db99b204e4bb406609b0d0fbc33b03f2c
2021-07-13 21:15:15 +00:00
parent 4c2e2d48c9 1023e9f615
commit 3cdbcac1a6
2 changed files with 15 additions and 2 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1875,6 +1875,16 @@ function showcommands() {
    fi
 }

+# Source necessary setup scripts needed to run the build with Remote Execution.
+function source_rbe() {
+    local T=$(gettop)
+
+    if [[ "x$USE_RBE" != "x" && "$USE_RBE" != "false" ]]; then
+        . $T/make/rbesetup.sh --skip-envsetup
+    fi
+}
+
 validate_current_shell
 source_vendorsetup
+source_rbe
 addcompletions