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

Commit 98f548c3 authored Nov 02, 2023 by Anas Sulaiman Committed by Automerger Merge Worker Nov 02, 2023

Merge "fix potential encoding issues in remote actions" into main am: 39ccc637 am: 78bbac7d

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

Change-Id: I927d63a80e44e3ee331ecd1223fe7f36119290d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b7a6324a 78bbac7d

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: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)

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: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" \