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

Commit 37ef2239 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Order apex files by destination path not source path"

parents 11bc0eef 56060290
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,9 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	// Sort to have consistent build rules
	sort.Slice(filesInfo, func(i, j int) bool {
		return filesInfo[i].builtFile.String() < filesInfo[j].builtFile.String()
		// Sort by destination path so as to ensure consistent ordering even if the source of the files
		// changes.
		return filesInfo[i].path() < filesInfo[j].path()
	})

	////////////////////////////////////////////////////////////////////////////////////////////