From 28e7f8cfbc34b2c38d28a06594b36374c702df25 Mon Sep 17 00:00:00 2001 From: Kousik Kumar Date: Mon, 23 Mar 2020 22:19:00 -0700 Subject: [PATCH] Update configuration for RemoteExecution actions 1. Specify addition inputs needed for R8 / D8 / Javac actions so that they can be successfully executed remotely. 2. Cleanup platform configuration so that pool-names are turned into a common variable and re-used between javac / r8 / d8 actions. Bug: b/152273259 Change-Id: I0231a96f6e4e094e98d0f89728f6ac3e34f78118 Merged-In: I0231a96f6e4e094e98d0f89728f6ac3e34f78118 --- core/rbe.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/rbe.mk b/core/rbe.mk index 7886e1ae4b..019ac04efd 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/jdk11/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/jdk11/linux-x86/bin/java) endif rbe_dir := endif +