tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I7eaf6d4568e348256a02b559ebd7f16aa1fa6225
This commit is contained in:
Treehugger Robot 2021-05-17 04:53:48 +00:00 committed by Automerger Merge Worker
commit 77ba8a2f7c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apex/apex.go
View file

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