Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aa9e47b authored by Kousik Kumar's avatar Kousik Kumar
Browse files

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
parent 37557784

envsetup.sh

+10 −0
Original line number Diff line number Diff line
@@ -1871,6 +1871,16 @@ 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

+5 −2
Original line number Diff line number Diff line
@@ -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.

# 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.