| commit | 2a476f6908c36d915d0f17a126c102389691269c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 01 06:23:02 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 01 06:23:02 2020 +0000 |
| tree | 1183cc28b8b1f117bbdc33494a2ad44e3651d839 | |
| parent | fbecdcf9589085b49a1577a419b6827b64f2a995 [diff] | |
| parent | fe66d3992b8ed26725265efc31d882eed092dc29 [diff] |
Merge "Unset USE_GOMA when using RBE."
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