Merge "Remove unnecessary RBE sourcing in envsetup.sh" am: 8bd19a4143
am: 49433fefde
Original change: https://android-review.googlesource.com/c/platform/build/+/1877136 Change-Id: I9dbff7baa033bd571e45b39a833463b505150f41
This commit is contained in:
10
envsetup.sh
10
envsetup.sh
@@ -1883,16 +1883,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/build/make/rbesetup.sh --skip-envsetup
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_current_shell
|
validate_current_shell
|
||||||
source_vendorsetup
|
source_vendorsetup
|
||||||
source_rbe
|
|
||||||
addcompletions
|
addcompletions
|
||||||
|
Reference in New Issue
Block a user