diff options
| author | Kousik Kumar <kousikk@google.com> | 2020-10-21 04:20:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-21 04:20:51 +0000 |
| commit | 16dd7f296fe684185f2bdcd2a7133ff1b0b3ef2f (patch) | |
| tree | d6986098db3c9d7f115bb0158d07164974da1087 | |
| parent | d745727f2f22855e29255d5d3712387195e05781 (diff) | |
| parent | e21a8a1c000f17fc03a619da5cdfb9d60dffe13f (diff) | |
| download | soong-16dd7f296fe684185f2bdcd2a7133ff1b0b3ef2f.tar.gz | |
Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716 am: 72fd2abc5c am: e21a8a1c00
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656
Change-Id: I7f218f2d042cabcad930e683a6dc76314d8bebd1
| -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 4490e1e2b..7f28d3af5 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -186,15 +186,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. |