commit fe66d3992b8ed26725265efc31d882eed092dc29
author Ramy Medhat <abdelaal@google.com> Wed Aug 26 05:47:33 2020 -0400
committer Ramy Medhat <abdelaal@google.com> Wed Aug 26 05:47:33 2020 -0400
tree 2eacf90f9c87576486f07fa9185dc1fb9af6770c
parent 0113aa20707eeaf6f473f8af7ab54b675e850e87

Unset USE_GOMA when using RBE.

Test: Ran rbesetup.sh after setting USE_GOMA
Change-Id: Idf6c1b4f7591aed96d5365e461260060004d4494

rbesetup.sh

diff --git a/rbesetup.sh b/rbesetup.sh
index adcf081..724ad7d 100644
--- a/rbesetup.sh
+++ b/rbesetup.sh
@@ -36,6 +36,7 @@
 # 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