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

Commit a2734a4d authored by Kousik Kumar's avatar Kousik Kumar
Browse files

resolve merge conflicts of 602859b1 to mainline-prod 

Change-Id: Ic708c79073c7367162dd8e683ac9759f75778233
Merged-In: I988381f4f72061f7c6eb99d58593f92cfd618b1b
parents 78c70d6a 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.