commit 602859b18603fea642cbcd486563f6bfa981eb4d
author Kousik Kumar <kousikk@google.com> Wed Sep 23 08:34:42 2020 +0000
committer Kousik Kumar <kousikk@google.com> Wed Sep 23 04:40:24 2020 -0400
tree dc74149977004d37b1d25835cc380cbd0dc6b18c
parent 63e1c37e6fb007e5af25f88aee4232735fd15612
parent a7beb10933218c347b67aba9c0a7c2c53d36acf1

resolve merge conflicts of a7beb10933218c347b67aba9c0a7c2c53d36acf1 to rvc-dev

Bug: b/167405184
Change-Id: Ib35af2813e7b60932df33f905d8e0398727ee545
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e

core/rbe.mk

diff --git a/core/rbe.mk b/core/rbe.mk
index 5101c7c..91606d4 100644
--- a/core/rbe.mk
+++ b/core/rbe.mk
@@ -34,12 +34,6 @@
     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
@@ -63,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.