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

Commit 2a3ace57 authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

Merge "Update rbesetup.sh script to no longer set certain env variables" am: ee8e14f3 

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



Change-Id: I00ffe91793aa0fca119c1a2fe27aa15fb91264a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53a766a4 ee8e14f3

rbesetup.sh

+0 −5
Original line number Diff line number Diff line
@@ -33,20 +33,15 @@ fi 
# This function prefixes the given command with appropriate variables needed

# for the build to be executed with RBE.

function use_rbe() {

  local RBE_LOG_DIR="/tmp"

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

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



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

  USE_RBE="true" \

  FLAG_server_address="unix:///tmp/reproxy_$RANDOM.sock" \

  FLAG_exec_root="$(gettop)" \

  FLAG_platform="container-image=docker://${DOCKER_IMAGE}" \

  RBE_use_application_default_credentials="true" \

  RBE_log_dir="${RBE_LOG_DIR}" \

  RBE_reproxy_wait_seconds="20" \

  RBE_output_dir="${RBE_LOG_DIR}" \

  RBE_log_path="text://${RBE_LOG_DIR}/reproxy_log.txt" \

  RBE_CXX_EXEC_STRATEGY="remote_local_fallback" \

  RBE_cpp_dependency_scanner_plugin="${RBE_BINARIES_DIR}/dependency_scanner_go_plugin.so" \

  RBE_DIR=${RBE_BINARIES_DIR} \