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

Commit 203c72ee authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Gerrit Code Review
Browse files

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

parents 4b8d81b4 678f26c1

envsetup.sh

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

+2 −5
Original line number Diff line number Diff line
@@ -24,11 +24,8 @@ function _source_env_setup_script() { 
}



# 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

# being invoked from envsetup.sh.

if [[ "$1" != "--skip-envsetup" ]]; then

# using the envsetup.sh defined functions.

_source_env_setup_script || return

fi



# This function prefixes the given command with appropriate variables needed

# for the build to be executed with RBE.