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

Commit 3fafb9b7 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I45d8c65a557d940442cd7866363b34c5f071fee0
parents 5f8eba77 203c72ee

envsetup.sh

+0 −10
Original line number Original line Diff line number Diff line
@@ -1871,16 +1871,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/make/rbesetup.sh --skip-envsetup

    fi

}



validate_current_shell

validate_current_shell

source_vendorsetup

source_vendorsetup

source_rbe

addcompletions
 
addcompletions

rbesetup.sh

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

# 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

# using the envsetup.sh defined functions.

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