commit 3d723c29d1ccd07e8cb02e0cc3bbdc819e84cce5
author Kousik Kumar <kousikk@google.com> Thu Oct 01 10:02:30 2020 +0000
committer Kousik Kumar <kousikk@google.com> Thu Oct 01 06:52:46 2020 -0400
tree 1d6f9e387732820f9029f8964d0009f856803ad3
parent a64636147a8aacac74dd8ea230085d0c7c9cdacc
parent 602859b18603fea642cbcd486563f6bfa981eb4d

resolve merge conflicts of 602859b18603fea642cbcd486563f6bfa981eb4d to rvc-d1-dev

Bug: b/169675226
Change-Id: I5e758b38cfdb71474a95cca6236e505116736586

core/rbe.mk

diff --git a/core/rbe.mk b/core/rbe.mk
index cfad09c..040ac0b 100644
--- a/core/rbe.mk
+++ b/core/rbe.mk
@@ -57,7 +57,7 @@
   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.