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

Commit 2650f35f authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main

parents c416ddd1 b67b061b

ui/build/config.go

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ func (c *configImpl) SoongMakeVarsMk() string { 
}



func (c *configImpl) SoongBuildMetrics() string {

	return filepath.Join(c.OutDir(), "soong_build_metrics.pb")

	return filepath.Join(c.LogsDir(), "soong_build_metrics.pb")

}



func (c *configImpl) ProductOut() string {

ui/build/soong.go

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ func loadSoongBuildMetrics(ctx Context, config Config, oldTimestamp time.Time) { 
		return

	}



	metricsData, err := os.ReadFile(config.SoongBuildMetrics())

	metricsData, err := os.ReadFile(soongBuildMetricsFile)

	if err != nil {

		ctx.Verbosef("Failed to read %s: %s", soongBuildMetricsFile, err)

		return