tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Set RBE_DIR default value to point to prebuilts in tree." into rvc-dev am: 461c0d4620

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12445424

Change-Id: I94277b21d4d3d8663ddc6d5a6c2596886238d7f4
This commit is contained in:
TreeHugger Robot 2020-09-16 00:37:28 +00:00 committed by Automerger Merge Worker
commit 772906db16
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/rbe.mk
View file

@ -19,7 +19,7 @@ ifneq ($(filter-out false,$(USE_RBE)),)
ifdef RBE_DIR
rbe_dir := $(RBE_DIR)
else
rbe_dir := $(HOME)/rbe
rbe_dir := prebuilts/remoteexecution-client/live/
endif
ifdef RBE_CXX_EXEC_STRATEGY
@ -37,19 +37,19 @@ ifneq ($(filter-out false,$(USE_RBE)),)
ifdef RBE_JAVAC_EXEC_STRATEGY
javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
else
javac_exec_strategy := "local"
javac_exec_strategy := remote_local_fallback
endif
ifdef RBE_R8_EXEC_STRATEGY
r8_exec_strategy := $(RBE_R8_EXEC_STRATEGY)
else
r8_exec_strategy := "local"
r8_exec_strategy := remote_local_fallback
endif
ifdef RBE_D8_EXEC_STRATEGY
d8_exec_strategy := $(RBE_D8_EXEC_STRATEGY)
else
d8_exec_strategy := "local"
d8_exec_strategy := remote_local_fallback
endif
platform := "container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62"