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

Merge "Notice file embededd in APEX is deterministic" am: 9980c6e111

Browse Source 
Change-Id: I25651a62edfcfc111af3591433e2f525b168158e
This commit is contained in:
Treehugger Robot
2020-05-30 08:12:24 +00:00
committed by Automerger Merge Worker
parent 8eb051e918 9980c6e111
commit bd7f948507
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/paths.go
View File

@@ -485,6 +485,15 @@ func FirstUniquePaths(list Paths) Paths {
return firstUniquePathsList(list) return firstUniquePathsList(list)
} }
// SortedUniquePaths returns what its name says
func SortedUniquePaths(list Paths) Paths {
unique := FirstUniquePaths(list)
sort.Slice(unique, func(i, j int) bool {
return unique[i].String() < unique[j].String()
})
return unique
}
func firstUniquePathsList(list Paths) Paths { func firstUniquePathsList(list Paths) Paths {
k := 0 k := 0
outer: outer:

2
apex/builder.go
View File

@@ -247,7 +247,7 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st
return android.NoticeOutputs{} return android.NoticeOutputs{}
} }
return android.BuildNoticeOutput(ctx, a.installDir, apexFileName, android.FirstUniquePaths(noticeFiles)) return android.BuildNoticeOutput(ctx, a.installDir, apexFileName, android.SortedUniquePaths(noticeFiles))
} }
func (a *apexBundle) buildInstalledFilesFile(ctx android.ModuleContext, builtApex android.Path, imageDir android.Path) android.OutputPath { func (a *apexBundle) buildInstalledFilesFile(ctx android.ModuleContext, builtApex android.Path, imageDir android.Path) android.OutputPath {