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

Commit 8e4868b0 authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Notice file embededd in APEX is deterministic" into rvc-dev am: 327b057e 

Change-Id: I5606f1369d5b17ef727a3c4ea5154d4d6418cb8c
parents 1889d782 327b057e

android/paths.go

+9 −0
Original line number Diff line number Diff line
@@ -483,6 +483,15 @@ outer: 
	return list[:k]

}



// 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

}



// LastUniquePaths returns all unique elements of a Paths, keeping the last copy of each.  It

// modifies the Paths slice contents in place, and returns a subslice of the original slice.

func LastUniquePaths(list Paths) Paths {

apex/builder.go

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