diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-10-19 01:45:46 -0400 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2020-10-20 19:51:14 +0000 |
| commit | 6d0034f49faa79037cfb51c61e41975533a5d432 (patch) | |
| tree | 95278432a7cca8c0a793a8a90822dc2f8698d57f | |
| parent | af7b75b8dbddad892f0037b9f5b6574855780bcd (diff) | |
| download | soong-6d0034f49faa79037cfb51c61e41975533a5d432.tar.gz | |
Deprecate both USE_GOMA and FORCE_USE_GOMA flags
Test:
m USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
m FORCE_USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
both result in error message being printed.
Bug: b/171325288
Change-Id: I94ccaf217dba71aca990d88d205bad669a49a2f5
Merged-In: I94ccaf217dba71aca990d88d205bad669a49a2f5
| -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. |