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

Commit ce4d6811 authored by Anas Sulaiman's avatar Anas Sulaiman Committed by Automerger Merge Worker
Browse files

Merge "fix RE for metalava actions" into main am: 3e173660 am: 87c1aac6 am: 0d5085bb 

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



Change-Id: Icd90151217f227abfb29fb0f2c99f5f602383cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dff7d13a 0d5085bb

core/rbe.mk

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
    d8_exec_strategy := remote_local_fallback

  endif



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

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

  cxx_platform := $(platform),Pool=$(cxx_pool)

  java_r8_d8_platform := $(platform),Pool=$(java_pool)

rbesetup.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ fi 
# for the build to be executed with RBE.

function use_rbe() {

  local RBE_BINARIES_DIR="prebuilts/remoteexecution-client/latest"

  local DOCKER_IMAGE="gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:953fed4a6b2501256a0d17f055dc17884ff71b024e50ade773e0b348a6c303e6"

  local DOCKER_IMAGE="gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:1eb7f64b9e17102b970bd7a1af7daaebdb01c3fb777715899ef462d6c6d01a45"



  # Do not set an invocation-ID and let reproxy auto-generate one.

  USE_RBE="true" \