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

Commit 602859b1 authored by Kousik Kumar's avatar Kousik Kumar
Browse files

resolve merge conflicts of a7beb109 to rvc-dev 

Bug: b/167405184
Change-Id: Ib35af2813e7b60932df33f905d8e0398727ee545
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e
parents 63e1c37e a7beb109

core/rbe.mk

+1 −7
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
    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 @@ 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.