diff options
Diffstat (limited to 'ui/build/config.go')
-rw-r--r-- | ui/build/config.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index ef46bec06..28ce57d04 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -154,15 +154,9 @@ func NewConfig(ctx Context, args ...string) Config { "EMPTY_NINJA_FILE", ) - if ret.UseGoma() { - ctx.Println("Goma for Android is being deprecated and replaced with RBE. See go/rbe_for_android for instructions on how to use RBE.") - ctx.Println() - ctx.Println("See go/goma_android_exceptions for exceptions.") - ctx.Fatalln("USE_GOMA flag is no longer supported.") - } - - if ret.ForceUseGoma() { - ret.environ.Set("USE_GOMA", "true") + if ret.UseGoma() || ret.ForceUseGoma() { + ctx.Println("Goma for Android has been deprecated and replaced with RBE. See go/rbe_for_android for instructions on how to use RBE.") + ctx.Fatalln("USE_GOMA / FORCE_USE_GOMA flag is no longer supported.") } // Tell python not to spam the source tree with .pyc files. |