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

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

Change-Id: I45d8c65a557d940442cd7866363b34c5f071fee0

envsetup.sh

@@ -1871,16 +1871,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

rbesetup.sh

@@ -24,11 +24,8 @@ function _source_env_setup_script() {
 }
 
 # This function needs to run first as the remaining defining functions may be
-# using the envsetup.sh defined functions. Skip this part if this script is already
-# being invoked from envsetup.sh.
-if [[ "$1" != "--skip-envsetup" ]]; then
-  _source_env_setup_script || return
-fi
+# using the envsetup.sh defined functions.
+_source_env_setup_script || return
 
 # This function prefixes the given command with appropriate variables needed
 # for the build to be executed with RBE.