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

Commit 2cfdeb28 authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++"... 

Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev am: f65ffea1 am: de90e238

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

Change-Id: I2f7eb551b842d43f0b51979dfd90bdc9a869768b
parents e81130bd de90e238

core/rbe.mk

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
    cxx_rbe_exec_strategy := "local"

  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
@@ -51,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)"

  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)"



  # Append rewrapper to existing *_WRAPPER variables so it's possible to

  # use both ccache and rewrapper.