diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-11-10 23:54:24 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2020-11-11 11:31:04 -0500 |
| commit | a2734a4d3280615fa09fa31a8e7a65acf65a644b (patch) | |
| tree | 081bf0ad39eb54303aafd91e9965fae51b37ed44 | |
| parent | 78c70d6abcdf7534918681e38a593b14a5403026 (diff) | |
| parent | 602859b18603fea642cbcd486563f6bfa981eb4d (diff) | |
| download | build-a2734a4d3280615fa09fa31a8e7a65acf65a644b.tar.gz | |
resolve merge conflicts of 602859b18603fea642cbcd486563f6bfa981eb4d to mainline-prod
Change-Id: Ic708c79073c7367162dd8e683ac9759f75778233
Merged-In: I988381f4f72061f7c6eb99d58593f92cfd618b1b
| -rw-r--r-- | core/rbe.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index cfad09cf6e..040ac0b19d 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -57,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)" --compare="$(cxx_compare)" + RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_allowlist=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. |