From 9aa9e47b8c3921037f779453341ae1a822d454ce Mon Sep 17 00:00:00 2001 From: Kousik Kumar Date: Mon, 12 Jul 2021 13:55:13 -0400 Subject: Add the ability to source RBE related scripts from envsetup.sh This is so that developers don't have to remember to source a separate script to source RBE related variables. I'll modify the docs once this change is submitted. Test: USE_RBE=true source build/envsetup.sh sources RBE variables. USE_RBE=false source build/envsetup.sh does NOT source RBE variables. source build/envsetup.sh does NOT source RBE variables. Bug: b/193407413 Change-Id: Ib8abf4c307b02fbb0c63b8a62d7aeda8be42d0fb --- rbesetup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'rbesetup.sh') diff --git a/rbesetup.sh b/rbesetup.sh index ec39e6ef17..3b0e7cf7dc 100644 --- a/rbesetup.sh +++ b/rbesetup.sh @@ -24,8 +24,11 @@ function _source_env_setup_script() { } # This function needs to run first as the remaining defining functions may be -# using the envsetup.sh defined functions. -_source_env_setup_script || return +# 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 # This function prefixes the given command with appropriate variables needed # for the build to be executed with RBE. -- cgit v1.2.3-59-g8ed1b