Merge "Deprecate both USE_GOMA and FORCE_USE_GOMA flags"

This commit is contained in:
Treehugger Robot 2020-10-20 03:21:59 +00:00 committed by Gerrit Code Review
commit d9052d177c

View file

@ -184,15 +184,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.