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

Revert "Add the ability to source RBE related scripts from envsetup.sh"

Browse Source 
This reverts commit 9aa9e47b8c.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-qpr-dev-plus-aosp&target=ndk&lkgb=7546337&lkbb=7546521&fkbb=7546426, bug https://buganizer.corp.google.com/issues/193566521

Fix: 193566521
Change-Id: I7196a00006499f729baa86a252b0df6535c6aeaa
This commit is contained in:
Ahaan Ugale
2021-07-13 22:12:01 +00:00
parent 9aa9e47b8c
commit 678f26c1e7
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

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

5
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.
if [[ "$1" != "--skip-envsetup" ]]; then
_source_env_setup_script || return _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.