commit 33c7736936b2f777dc93bc26cbcbda56c0c144b7
author Jiyong Park <jiyong@google.com> Fri May 29 22:00:16 2020 +0900
committer Jiyong Park <jiyong@google.com> Fri May 29 22:00:16 2020 +0900
tree 1257edd6642f21eb34a102d4338f735e9f80a620
parent 705e6e8ce90b267786fa6bc5f6f05a9439d508ed

Notice file embededd in APEX is deterministic

Bug: 157724521
Test: m
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151

apex/builder.go

diff --git a/apex/builder.go b/apex/builder.go
index a6a347b..a7053dc 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -247,7 +247,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 {