Commit b42c464c authored Jan 20, 2022 by Junfeng Wu

Remove the duplicate RBE_CXX_COMPARE config.

The duplication comes from a merge conflict resolution: https://cs.android.com/android/_/android/platform/build/+/0d0d422359de1d0c443edad0bb1168a125b94dfe:core/rbe.mk;dlc=76ffe4f5ba0c711b118b9df010ffde328866367d

Test: Ran an RBE build locally with RBE_CXX_COMPARE enabled.
Bug: b/214886208

Change-Id: I7104fe3ce0c2861594f42633eb19105ff845ae4d

parent 1a4752be

core/rbe.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -46,12 +46,6 @@ 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