Merge "Revert "Add the ability to source RBE related scripts from envsetup.sh"" am: 203c72ee23 am: 3fafb9b720 am: b84510e31e am: a98c3d76c3

Original change: https://android-review.googlesource.com/c/platform/build/+/1764839 Change-Id: Ie229b1ccac498c5a1df30b1a25a3aeefae84637c
2021-07-13 23:20:26 +00:00
parent c8e33d0b47 a98c3d76c3
commit 04a01c67d6
2 changed files with 2 additions and 15 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1875,16 +1875,6 @@ 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