Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554 Change-Id: Ic41467c4efcfe663b20670c01aa15916a57ff864 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user