StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Order apex files by destination path not source path" am: 37ef223972

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708563

Change-Id: If795b8f41f8cc2a7ede1a107b9b48b5ab9ba8ffa
This commit is contained in:
Treehugger Robot
2021-05-17 04:28:05 +00:00
committed by Automerger Merge Worker
parent 9318bd1437 37ef223972
commit 9945b3a989
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -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()
})
////////////////////////////////////////////////////////////////////////////////////////////