diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-09-16 19:16:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 19:16:57 +0000 |
| commit | 22ccf36b1ba7cd51e5b76a25f9b028944c1a7703 (patch) | |
| tree | 7baa82d36f4300ca15b8204e66596f3bb399190f | |
| parent | 7de98747f4444fda7b694720e7df3ef7e2f1afd8 (diff) | |
| parent | 94bf36bd929afa3d1b3c6bf9d2e7413bf2ffcf4e (diff) | |
| download | build-22ccf36b1ba7cd51e5b76a25f9b028944c1a7703.tar.gz | |
Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825
Change-Id: I3ee84b49cdaffcbc1f1ebae1e55e34aa08b5e8e8
| -rw-r--r-- | core/rbe.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index 340c3a4c33..0d492fb5fa 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -25,13 +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" + cxx_compare := false endif ifdef RBE_JAVAC_EXEC_STRATEGY @@ -52,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)" --compare="$(cxx_compare)" + 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. @@ -65,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 := |