Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f4bdf50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Add Goma deprecation PSA to soong." into qt-dev

parents b4435196 ee50d5b5

cmd/soong_ui/main.go

+3 −1
Original line number Diff line number Diff line
@@ -119,9 +119,11 @@ func main() { 
		logsDir = filepath.Join(config.DistDir(), "logs")

	}



	buildErrorFile := filepath.Join(logsDir, logsPrefix+"build_error")

	rbeMetricsFile := filepath.Join(logsDir, logsPrefix+"rbe_metrics.pb")

	soongMetricsFile := filepath.Join(logsDir, logsPrefix+"soong_metrics")

	defer build.UploadMetrics(buildCtx, config, simpleOutput, buildStarted, rbeMetricsFile, soongMetricsFile)

	defer build.UploadMetrics(buildCtx, config, simpleOutput, buildStarted, buildErrorFile, rbeMetricsFile, soongMetricsFile)

	defer build.PrintGomaDeprecation(buildCtx, config)



	os.MkdirAll(logsDir, 0777)

ui/build/rbe.go

+10 −0
Original line number Diff line number Diff line
@@ -128,3 +128,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, "")

	}

}