commit 402ace6c2549e82a1a0a8f47b8335f15c18db7da
author Jiyong Park <jiyong@google.com> Fri May 29 22:00:16 2020 +0900
committer Jiyong Park <jiyong@google.com> Sat May 30 12:11:16 2020 +0000
tree c18cc998b247e3e39e66801fb424e6b5b617f406
parent 9e0264c3799099d36ad7a393ace2799aa5da6a88

Notice file embededd in APEX is deterministic

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 157724521
Test: m
Merged-In: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
(cherry picked from commit 33c7736936b2f777dc93bc26cbcbda56c0c144b7)
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index cebd86a..4c42259 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -238,7 +238,7 @@
 		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 {