diff options
| author | 2020-08-18 17:29:48 -0400 | |
|---|---|---|
| committer | 2020-09-15 20:33:53 +0000 | |
| commit | ee17f8c02e27ef3fb7956e0177d2c98d3b4aa0a5 (patch) | |
| tree | a8a7f8d635cbb1e971b3bbef5fb8040c4ceac208 | |
| parent | d2c89f6311bdcc0325b01ef0517f22449b0f5af4 (diff) | |
Add Goma deprecation PSA to soong.
Test: build with Goma
Bug: b/166273085
Change-Id: Ie7e146285afd40bc0a1dc17a0b898960f57a118b
Merged-In: Ie7e146285afd40bc0a1dc17a0b898960f57a118b
| -rw-r--r-- | cmd/soong_ui/main.go | 1 | ||||
| -rw-r--r-- | ui/build/rbe.go | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 78e636cf0..89ece8d16 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -173,6 +173,7 @@ func main() { rbeMetricsFile := filepath.Join(logsDir, c.logsPrefix+"rbe_metrics.pb") soongMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_metrics") defer build.UploadMetrics(buildCtx, config, c.forceDumbOutput, buildStarted, buildErrorFile, rbeMetricsFile, soongMetricsFile) + defer build.PrintGomaDeprecation(buildCtx, config) os.MkdirAll(logsDir, 0777) log.SetOutput(filepath.Join(logsDir, c.logsPrefix+"soong.log")) diff --git a/ui/build/rbe.go b/ui/build/rbe.go index 99107e3d9..d45e38059 100644 --- a/ui/build/rbe.go +++ b/ui/build/rbe.go @@ -125,3 +125,13 @@ func DumpRBEMetrics(ctx Context, config Config, filename string) { ctx.Fatalf("failed to copy %q to %q: %v\n", metricsFile, filename, err) } } + +// PrintGomaDeprecation prints a PSA on the deprecation of Goma if it is set for the build. +func PrintGomaDeprecation(ctx Context, config Config) { + if config.UseGoma() { + fmt.Fprintln(ctx.Writer, "") + fmt.Fprintln(ctx.Writer, "Goma for Android is being deprecated and replaced with RBE.") + fmt.Fprintln(ctx.Writer, "See go/goma_android_deprecation for more details.") + fmt.Fprintln(ctx.Writer, "") + } +} |