Commit 2fb7d4ab authored Nov 09, 2021 by Kousik Kumar Committed by Automerger Merge Worker Nov 09, 2021

Merge "Remove unnecessary RBE sourcing in envsetup.sh" am: 8bd19a41 am:...

Merge "Remove unnecessary RBE sourcing in envsetup.sh" am: 8bd19a41 am: 49433fef am: 3a42b842 am: 49fd1bb0

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

Change-Id: I027f8a42d06a3fd35b23cf970f1145a4f8b5ef6c

envsetup.sh

+0 −10

Original line number	Diff line number	Diff line
		@@ -1883,16 +1883,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/build/make/rbesetup.sh --skip-envsetup
		fi
		}

		validate_current_shell
		source_vendorsetup
		source_rbe
		addcompletions