Merge "Do not dump metrics if reproxy was never started" am: 13642d4735

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031425

Change-Id: Ib1fb3f6a43ffb92810a3e977c31f45d9e56c9d00

cmd/soong_ui/main.go

@@ -221,7 +221,6 @@ func main() {
 		}
 		defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, files...)
 		defer met.Dump(soongMetricsFile)
-		defer build.DumpRBEMetrics(buildCtx, config, rbeMetricsFile)
 	}
 
 	// Read the time at the starting point.

ui/build/build.go

@@ -264,6 +264,7 @@ func Build(ctx Context, config Config) {
 
 	if config.StartRBE() {
 		startRBE(ctx, config)
+		defer DumpRBEMetrics(ctx, config, filepath.Join(config.LogsDir(), "rbe_metrics.pb"))
 	}
 
 	if what&RunProductConfig != 0 {