StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie229b1ccac498c5a1df30b1a25a3aeefae84637c
This commit is contained in:
Ahaan Ugale
2021-07-13 23:20:26 +00:00
committed by Automerger Merge Worker
parent c8e33d0b47 a98c3d76c3
commit 04a01c67d6
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
envsetup.sh
View File

@@ -1875,16 +1875,6 @@ function showcommands() {
fi 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 validate_current_shell
source_vendorsetup source_vendorsetup
source_rbe
addcompletions addcompletions

7
rbesetup.sh
View File

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