diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-09-02 11:39:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-02 11:39:39 +0000 |
| commit | 97a8b0429a8ff256e519ecf1b652ec79fa53ef0e (patch) | |
| tree | 71fce63cd124d1487d57e9f23fb3607285e68449 | |
| parent | a3933f760ec31a73db8fe161250cb3c622e8dccb (diff) | |
| parent | 136274bfaa4a2a3e2505ff0ef1bdbb1544a3f3f3 (diff) | |
| download | build-97a8b0429a8ff256e519ecf1b652ec79fa53ef0e.tar.gz | |
[DO NOT MERGE] Update configuration for RemoteExecution actions am: 136274bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468477
Change-Id: I3433f0d3e24302f14c5fe317b3e49a6497572807
| -rw-r--r-- | core/rbe.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index 7886e1ae4b..619a7913a7 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -46,8 +46,12 @@ ifneq ($(filter-out false,$(USE_RBE)),) d8_exec_strategy := "local" 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" + RBE_WRAPPER := $(rbe_dir)/rewrapper - RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) + RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" # Append rewrapper to existing *_WRAPPER variables so it's possible to # use both ccache and rewrapper. @@ -55,16 +59,17 @@ 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,shallow=true --exec_strategy=$(javac_exec_strategy)) + 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,shallow=true --exec_strategy=$(r8_exec_strategy)) + 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,shallow=true --exec_strategy=$(d8_exec_strategy)) + 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 := endif + |