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

Commit 7251bdc6 authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 602859b1 to rvc-d1-dev am: 3d723c29 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12735596

Change-Id: Ie8b703fb37051d1ed73648263de4884bdd311dfb
parents 30ddcaa0 3d723c29

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.