openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[DO NOT MERGE] Add Goma deprecation PSA to soong. 

Test: build with Goma
Bug: b/166273085
Change-Id: Ie7e146285afd40bc0a1dc17a0b898960f57a118b
Merged-In: Ie7e146285afd40bc0a1dc17a0b898960f57a118b
This commit is contained in:
Ramy Medhat 2020-08-18 17:29:48 -04:00 committed by Kousik Kumar
parent 320c041797
commit ee50d5b5b0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/soong_ui/main.go
View File

@ -119,9 +119,11 @@ func main() {
logsDir = filepath.Join(config.DistDir(), "logs") logsDir = filepath.Join(config.DistDir(), "logs")
} }
buildErrorFile := filepath.Join(logsDir, logsPrefix+"build_error")
rbeMetricsFile := filepath.Join(logsDir, logsPrefix+"rbe_metrics.pb") rbeMetricsFile := filepath.Join(logsDir, logsPrefix+"rbe_metrics.pb")
soongMetricsFile := filepath.Join(logsDir, logsPrefix+"soong_metrics") 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) os.MkdirAll(logsDir, 0777)

10
ui/build/rbe.go
View File

@ -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) 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, "")
}
}