diff options
| author | 2020-10-21 04:01:35 +0000 | |
|---|---|---|
| committer | 2020-10-21 04:01:35 +0000 | |
| commit | 72fd2abc5cac5618f04e4f7002c9825f19a9e4ab (patch) | |
| tree | 9dda2d590e9a44424c09a7cb07b2d6fd71fc16f6 | |
| parent | 7790f714d5317b82b8d118d257b1d5994b6f123d (diff) | |
| parent | 04f6efa7160b91274ebf432cdba15cd9da52b1b2 (diff) | |
Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656
Change-Id: Ib4848042fdc9926a9929e6eebf416e01d045fd90
| -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. |