Skip to content

Commit

Permalink
fix RE for metalava actions
Browse files Browse the repository at this point in the history
Some of those actions use unzip which is not available in the source
tree and needs to be installed in the container.

Bug: b/309783005
Test: Ran an android build and verified there are no local fallbacks from metalava actions.
Change-Id: I360c3fb30e2eacc0615ed636115bce011bff5bf3
  • Loading branch information
mrahs committed Nov 15, 2023
1 parent 4277d61 commit 5dacf0f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/rbe.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion rbesetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 5dacf0f

Please sign in to comment.