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

This commit is contained in:
Colin Cross 2023-11-01 16:54:14 +00:00 committed by Gerrit Code Review
commit 2650f35faa
2 changed files with 2 additions and 2 deletions

View file

@ -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 {

View file

@ -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