diff options
| author | 2022-05-27 11:27:14 -0400 | |
|---|---|---|
| committer | 2022-05-27 11:31:45 -0400 | |
| commit | 61238bdffce597b1f7040e7d4ae46926da061dcc (patch) | |
| tree | 9e4f6549bc67f8980a2eee1e4f00ffd13bfdf597 | |
| parent | cc303becee88bc5ca9d2edd98401fcc0dfb6f3c2 (diff) | |
Update rbesetup.sh script to no longer set certain env variables
These environment variables are no longer needed to be set explicitly.
Soong can set reasonable defaults for these variables.
Bug: b/233382420
Change-Id: Ie07e93a68b9d7fa6de576efd976c208761ee0063
| -rw-r--r-- | rbesetup.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/rbesetup.sh b/rbesetup.sh index 3b0e7cf7dc..8386628a26 100644 --- a/rbesetup.sh +++ b/rbesetup.sh @@ -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} \ |