Sort the inputs to mergedAconfigFilesRule
The aconfig files are collected by visiting the direct deps of the module. VisitDirectDeps does not guarantee ordered traversal. To prevent non-determinism in the generated ninja file, sort the inputs. Test: go build ./android Change-Id: Ic67fc0859bf18de62b6297ed502d1d495cc3a780
This commit is contained in:
@@ -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]}
|
||||
}
|
||||
|
Reference in New Issue
Block a user