openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Paul Duffin 2021-05-18 10:03:13 +00:00 committed by Android (Google) Code Review
parent 2ca5b08593 b18537443e
commit bcf3a97109
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()
})
////////////////////////////////////////////////////////////////////////////////////////////