diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-09-16 19:16:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 19:16:55 +0000 |
| commit | 7de98747f4444fda7b694720e7df3ef7e2f1afd8 (patch) | |
| tree | ba7c5e38006d374749c8a4232d6bafed35301bd6 | |
| parent | 4f66e757297cfe287d0eac9441a22c0b50bc19b5 (diff) | |
| parent | 0118dd2f83c50333af51bb5be72946ee28ab04e3 (diff) | |
| download | build-7de98747f4444fda7b694720e7df3ef7e2f1afd8.tar.gz | |
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
| -rw-r--r-- | core/rbe.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index 08ef0048d4..340c3a4c33 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -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. |