From 6ecd7d177aede22144bd78a4f19322f0e522a2ec Mon Sep 17 00:00:00 2001 From: Junfeng Wu Date: Wed, 18 May 2022 20:46:37 +0800 Subject: [PATCH] Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/ Test: USE_RBE=true m Bug: 233046271 Change-Id: I71d71a3560a97a2173bf415fe8a584ea0c0a5942 --- core/rbe.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/rbe.mk b/core/rbe.mk index 370d4bd0e0..90328d3ea7 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -87,11 +87,11 @@ ifneq ($(filter-out false,$(USE_RBE)),) 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/jdk11/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_DIR)/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 --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) + D8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=d8 --exec_strategy=$(d8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=$(OUT_DIR)/soong/host/linux-x86/framework/d8.jar --toolchain_inputs=prebuilts/jdk/jdk11/linux-x86/bin/java) endif rbe_dir :=