From b72060b0296f4b9695d97e982625a9062cd68bd5 Mon Sep 17 00:00:00 2001 From: Anas Sulaiman Date: Wed, 1 Nov 2023 16:52:21 +0000 Subject: [PATCH] fix potential encoding issues in remote actions The new docker image contains all en_*.UTF-8 locales to ensure Java (and other) actions produce the correct bytes. Bug: b/300624128 Test: Ran an android build and verified there are no encoding issues in metalava outputs. Change-Id: Id1eab37edfc71b3b56f4ac38259407c0a1b10667 --- core/rbe.mk | 2 +- rbesetup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/rbe.mk b/core/rbe.mk index 6754b0a171..001a549b40 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -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) diff --git a/rbesetup.sh b/rbesetup.sh index 8386628a26..9e246ff02b 100644 --- a/rbesetup.sh +++ b/rbesetup.sh @@ -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" \