Commit 35e0e89a authored Oct 15, 2020 by Kousik Kumar Committed by Automerger Merge Worker Oct 15, 2020

resolve merge conflicts of 602859b1 to...

resolve merge conflicts of 602859b1 to rvc-d1-dev am: 3d723c29 am: 0d0d4223

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

Change-Id: I1de7d552d8e43451700a347e6ec48ced444e9497

core/rbe.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ ifneq ($(filter-out false,$(USE_RBE)),)
		cxx_compare := false
		endif

		ifdef RBE_CXX_COMPARE
		cxx_compare := $(RBE_CXX_COMPARE)
		else
		cxx_compare := "false"
		endif

		ifdef RBE_JAVAC_EXEC_STRATEGY
		javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
		else