StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613

Change-Id: I1a036f07e5d8c39ec4abfbb200b780b9cc8322b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anas Sulaiman
2023-11-02 18:20:41 +00:00
committed by Automerger Merge Worker
parent 11edb41b75 39ccc6378e
commit 78bbac7d51
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/rbe.mk
View File

@@ -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:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62
platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:953fed4a6b2501256a0d17f055dc17884ff71b024e50ade773e0b348a6c303e6
cxx_platform := $(platform),Pool=$(cxx_pool)
java_r8_d8_platform := $(platform),Pool=$(java_pool)

2
rbesetup.sh
View File

@@ -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:582efb38f0c229ea39952fff9e132ccbe183e14869b39888010dacf56b360d62"
local DOCKER_IMAGE="gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:953fed4a6b2501256a0d17f055dc17884ff71b024e50ade773e0b348a6c303e6"
# Do not set an invocation-ID and let reproxy auto-generate one.
USE_RBE="true" \