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

Commit b1103b63 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." am: 9c81a78e am: 43044f0b 

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

Change-Id: Ia31e86c94d7d8a87b6feba578e02e4d68fc63b48
parents 86d27133 43044f0b

core/rbe.mk

+4 −4
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  ifdef RBE_DIR

  ifdef RBE_DIR

    rbe_dir := $(RBE_DIR)

    rbe_dir := $(RBE_DIR)

  else

  else

    rbe_dir := $(HOME)/rbe

    rbe_dir := prebuilts/remoteexecution-client/live/

  endif

  endif





  ifdef RBE_CXX_EXEC_STRATEGY

  ifdef RBE_CXX_EXEC_STRATEGY
@@ -37,19 +37,19 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  ifdef RBE_JAVAC_EXEC_STRATEGY

  ifdef RBE_JAVAC_EXEC_STRATEGY

    javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)

    javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)

  else

  else

    javac_exec_strategy := local

    javac_exec_strategy := remote_local_fallback

  endif

  endif





  ifdef RBE_R8_EXEC_STRATEGY

  ifdef RBE_R8_EXEC_STRATEGY

    r8_exec_strategy := $(RBE_R8_EXEC_STRATEGY)

    r8_exec_strategy := $(RBE_R8_EXEC_STRATEGY)

  else

  else

    r8_exec_strategy := local

    r8_exec_strategy := remote_local_fallback

  endif

  endif





  ifdef RBE_D8_EXEC_STRATEGY

  ifdef RBE_D8_EXEC_STRATEGY

    d8_exec_strategy := $(RBE_D8_EXEC_STRATEGY)

    d8_exec_strategy := $(RBE_D8_EXEC_STRATEGY)

  else

  else

    d8_exec_strategy := local

    d8_exec_strategy := remote_local_fallback

  endif

  endif





  platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62

  platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62