Merge "Unset USE_GOMA when using RBE."

2020-09-01 06:23:02 +00:00 · 2020-09-01 06:23:02 +00:00 · 2a476f6908
parent fbecdcf958 fe66d3992b
commit 2a476f6908
1 changed files with 1 additions and 0 deletions
--- a/rbesetup.sh
+++ b/rbesetup.sh
@ -36,6 +36,7 @@ function _export_metrics_uploader() {
 # This function sets RBE specific environment variables needed for the build to
 # executed by RBE. This file should be sourced once per checkout of Android code.
 function _set_rbe_vars() {
+  unset USE_GOMA
  export USE_RBE="true"
  export RBE_CXX_EXEC_STRATEGY="remote_local_fallback"
  export RBE_JAVAC=1