diff options
| author | 2020-05-30 07:54:31 +0000 | |
|---|---|---|
| committer | 2020-05-30 07:54:31 +0000 | |
| commit | 9980c6e111b6f441eac8a437d6f963b25de67953 (patch) | |
| tree | 9ed822140c9a7ed5227f83ed2c9b0514ec0283b4 | |
| parent | 7c9db5d13f3165f44ebc36d2b8d21bb436d314ec (diff) | |
| parent | 33c7736936b2f777dc93bc26cbcbda56c0c144b7 (diff) | |
Merge "Notice file embededd in APEX is deterministic"
| -rw-r--r-- | android/paths.go | 9 | ||||
| -rw-r--r-- | apex/builder.go | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/android/paths.go b/android/paths.go index fcea65c55..3ad27acbe 100644 --- a/android/paths.go +++ b/android/paths.go @@ -485,6 +485,15 @@ func FirstUniquePaths(list Paths) Paths { 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 { k := 0 outer: diff --git a/apex/builder.go b/apex/builder.go index a6a347b5f..a7053dcf1 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -247,7 +247,7 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st 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 { |