diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-07-25 14:07:36 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 19:03:32 +0200 |
| commit | c8277f2630734f27e7c594de29ab9c4dba2279e2 (patch) | |
| tree | bfa0da67d8b27ac4af885b73e15fcbc5a41085b8 /cmd | |
| parent | 138dd2ad0fbd3ec86b634ee387d64ffb82732701 (diff) | |
| download | build_soong-c8277f2630734f27e7c594de29ab9c4dba2279e2.tar.gz build_soong-c8277f2630734f27e7c594de29ab9c4dba2279e2.tar.bz2 build_soong-c8277f2630734f27e7c594de29ab9c4dba2279e2.zip | |
Deprecate ONE_SHOT_MAKEFILE
mm is now doing the same thing as mma. Now print a deprecation message
for other tools that may be setting ONE_SHOT_MAKEFILE directly (or users
that are still using a very old envsetup.sh).
Test: mm # does not print
Test: ONE_SHOT_MAKEFILE=bionic m
Change-Id: I98221657024d824a61c0d721d5c7dd1a2ea2fb1e
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/soong_ui/main.go | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index f5c007da..6bd08dd4 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -434,7 +434,26 @@ func make(ctx build.Context, config build.Config, _ []string, logsDir string) { fmt.Fprintln(writer, "!") fmt.Fprintln(writer, "! Older versions are saved in verbose.log.#.gz files") fmt.Fprintln(writer, "") - time.Sleep(5 * time.Second) + select { + case <-time.After(5 * time.Second): + case <-ctx.Done(): + return + } + } + + if _, ok := config.Environment().Get("ONE_SHOT_MAKEFILE"); ok { + writer := ctx.Writer + fmt.Fprintln(writer, "! The variable `ONE_SHOT_MAKEFILE` is deprecated, and will be removed shortly.") + fmt.Fprintln(writer, "!") + fmt.Fprintln(writer, "! If you're using `mm`, you'll need to run `source build/envsetup.sh` to update.") + fmt.Fprintln(writer, "!") + fmt.Fprintln(writer, "! Otherwise, either specify a module name with m, or use mma / MODULES-IN-...") + fmt.Fprintln(writer, "") + select { + case <-time.After(30 * time.Second): + case <-ctx.Done(): + return + } } toBuild := build.BuildAll |