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

Commit bcf3a971 authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "Order apex files by destination path not source path" into sc-dev

parents 2ca5b085 b1853744

apex/apex.go

+3 −1
Original line number Diff line number Diff line
@@ -1927,7 +1927,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()

	})



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