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

Commit 401a1cf0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix possible race condition"

parents 78d15f2b 036b5a3e
Loading
Loading
Loading
Loading
+9 −8
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ func main() {

	// Create a new Status instance, which manages action counts and event output channels.
	stat := &status.Status{}
	defer stat.Finish()

	// Hook up the terminal output and tracer to Status.
	stat.AddOutput(output)
	stat.AddOutput(trace.StatusTracer())
@@ -221,13 +221,14 @@ func main() {

	trace.SetOutput(filepath.Join(logsDir, c.logsPrefix+"build.trace"))

	defer func() {
		stat.Finish()
		criticalPath.WriteToMetrics(met)
		met.Dump(soongMetricsFile)
		if !config.SkipMetricsUpload() {
		defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...)
			build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, bazelProfileFile, bazelMetricsFile, metricsFiles...)
		}
	defer met.Dump(soongMetricsFile)
	// Should run before Metric.Dump
	defer criticalPath.WriteToMetrics(met)

	}()
	c.run(buildCtx, config, args)

}