Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5142cae7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I2c22ccc23ead183afb30372cf54688b29a44a6b7
parents 581994cd 772906db

core/rbe.mk

+4 −4
Original line number Diff line number Diff line
@@ -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"