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

Merge "Sort the inputs to mergedAconfigFilesRule" into main am: bb0d5866c5

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

Change-Id: Idc0672a97f069a3fa673db9ff5b64a01cc8e5b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-02-05 21:23:50 +00:00
committed by Automerger Merge Worker
parent 0f01d9efff bb0d5866c5
commit a27655f5f8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/aconfig_providers.go
View File

@@ -171,7 +171,7 @@ func aconfigUpdateAndroidMkEntries(ctx fillInEntriesContext, mod Module, entries
}
func mergeAconfigFiles(ctx ModuleContext, container string, inputs Paths, generateRule bool) Paths {
inputs = LastUniquePaths(inputs)
inputs = SortedUniquePaths(inputs)
if len(inputs) == 1 {
return Paths{inputs[0]}
}