Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d723c29 authored by Kousik Kumar's avatar Kousik Kumar
Browse files

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

Bug: b/169675226
Change-Id: I5e758b38cfdb71474a95cca6236e505116736586
parents a6463614 602859b1

core/rbe.mk

+1 −1
Original line number Diff line number Diff line
@@ -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.