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

Commit 1023e9f6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Add the ability to source RBE related scripts from envsetup.sh" am: 10935cf3 am: 85382dcf am: 955e561f

Original change: https://android-review.googlesource.com/c/platform/build/+/1763565

Change-Id: If5fd596985d9e5282ec7e93fd72949f3d1c4a719
parents c0e0d69b 955e561f

envsetup.sh

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

rbesetup.sh

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

# 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

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