diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-16 00:23:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 00:23:57 +0000 |
| commit | b1a9ea090c1188fd36cde52e2d78536157f48ae8 (patch) | |
| tree | 972acec8b1343f8af25fce09f0df09d5a5dd1191 | |
| parent | 084b8332237cbf2adfc497ce81637921d6d795c7 (diff) | |
| parent | 461c0d46205e20f125b93e0392ba47de5c064d57 (diff) | |
| download | build-b1a9ea090c1188fd36cde52e2d78536157f48ae8.tar.gz | |
Merge "Set RBE_DIR default value to point to prebuilts in tree." into rvc-dev am: 461c0d4620
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12445424
Change-Id: I4983a13ec90dead4a3538dd400e173c8a574afe5
| -rw-r--r-- | core/rbe.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/rbe.mk b/core/rbe.mk index 9ec8481662..cfad09cf6e 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -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" |