StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa am: dcaeff507a

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

Change-Id: Ib3ed1f73ac4a068979e15b8072cb1cb8ecfd097b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-11-01 17:42:22 +00:00
committed by Automerger Merge Worker
parent cdef52cdbf dcaeff507a
commit 38a5e8285a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/build/config.go
View File

@@ -1536,7 +1536,7 @@ func (c *configImpl) SoongMakeVarsMk() string {
} }
func (c *configImpl) SoongBuildMetrics() 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 { func (c *configImpl) ProductOut() string {

2
ui/build/soong.go
View File

@@ -759,7 +759,7 @@ func loadSoongBuildMetrics(ctx Context, config Config, oldTimestamp time.Time) {
return return
} }
metricsData, err := os.ReadFile(config.SoongBuildMetrics()) metricsData, err := os.ReadFile(soongBuildMetricsFile)
if err != nil { if err != nil {
ctx.Verbosef("Failed to read %s: %s", soongBuildMetricsFile, err) ctx.Verbosef("Failed to read %s: %s", soongBuildMetricsFile, err)
return return