From fe66d3992b8ed26725265efc31d882eed092dc29 Mon Sep 17 00:00:00 2001 From: Ramy Medhat Date: Wed, 26 Aug 2020 05:47:33 -0400 Subject: [PATCH] Unset USE_GOMA when using RBE. Test: Ran rbesetup.sh after setting USE_GOMA Change-Id: Idf6c1b4f7591aed96d5365e461260060004d4494 --- rbesetup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/rbesetup.sh b/rbesetup.sh index adcf08131..724ad7dc5 100644 --- 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