Add RBE_CXX_COMPARE variable to locally disable compare mode for C++ am: 0118dd2f83

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

Change-Id: I88fc811658a05340c8c16f16bcb388f5f8aba9d5
This commit is contained in:
Kousik Kumar
2020-09-16 19:16:55 +00:00
committed by Automerger Merge Worker

View File

@@ -28,6 +28,12 @@ ifneq ($(filter-out false,$(USE_RBE)),)
cxx_rbe_exec_strategy := "local"
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
@@ -51,7 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),)
java_r8_d8_platform := $(platform)",Pool=java16"
RBE_WRAPPER := $(rbe_dir)/rewrapper
RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)"
RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" --compare="$(cxx_compare)"
# Append rewrapper to existing *_WRAPPER variables so it's possible to
# use both ccache and rewrapper.