Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9980c6e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Notice file embededd in APEX is deterministic"

parents 7c9db5d1 33c77369

android/paths.go

+9 −0
Original line number Diff line number Diff line
@@ -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:

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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 {