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

Commit 94bf36bd authored by Kousik Kumar's avatar Kousik Kumar Committed by Android (Google) Code Review
Browse files

Merge changes Ic8a8adb3,Ia972c74d into qt-dev 

* changes:
  Remove double quotes in rbe.mk file
  Add RBE_CXX_COMPARE variable to locally disable compare mode for C++
parents d9cf148d f037e1a9

core/rbe.mk

+14 −8
Original line number Diff line number Diff line
@@ -25,7 +25,13 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  ifdef RBE_CXX_EXEC_STRATEGY

    cxx_rbe_exec_strategy := $(RBE_CXX_EXEC_STRATEGY)

  else

    cxx_rbe_exec_strategy := "local"

    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
@@ -46,12 +52,12 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
    d8_exec_strategy := remote_local_fallback

  endif



  platform := "container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62"

  cxx_platform := $(platform)",Pool=default"

  java_r8_d8_platform := $(platform)",Pool=java16"

  platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62

  cxx_platform := $(platform),Pool=default

  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.
@@ -59,15 +65,15 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(RBE_WRAPPER) $(RBE_CXX))



  ifdef RBE_JAVAC

    JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(RBE_WRAPPER) --labels=type=compile,lang=java,compiler=javac --exec_strategy=$(javac_exec_strategy) --platform="$(java_r8_d8_platform)")

    JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(RBE_WRAPPER) --labels=type=compile,lang=java,compiler=javac --exec_strategy=$(javac_exec_strategy) --platform=$(java_r8_d8_platform))

  endif



  ifdef RBE_R8

    R8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=r8 --exec_strategy=$(r8_exec_strategy) --platform="$(java_r8_d8_platform)" --inputs=out/soong/host/linux-x86/framework/r8-compat-proguard.jar,build/make/core/proguard_basic_keeps.flags --toolchain_inputs=prebuilts/jdk/jdk9/linux-x86/bin/java)

    R8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=r8 --exec_strategy=$(r8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=out/soong/host/linux-x86/framework/r8-compat-proguard.jar,build/make/core/proguard_basic_keeps.flags --toolchain_inputs=prebuilts/jdk/jdk9/linux-x86/bin/java)

  endif



  ifdef RBE_D8

    D8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=d8 --exec_strategy=$(d8_exec_strategy) --platform="$(java_r8_d8_platform)" --inputs=out/soong/host/linux-x86/framework/d8.jar --toolchain_inputs=prebuilts/jdk/jdk9/linux-x86/bin/java)

    D8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=d8 --exec_strategy=$(d8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=out/soong/host/linux-x86/framework/d8.jar --toolchain_inputs=prebuilts/jdk/jdk9/linux-x86/bin/java)

  endif



  rbe_dir :=