diff options
| -rw-r--r-- | android/aconfig_providers.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index fcc57e1a4..4c1782b8e 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -105,7 +105,8 @@ func CollectDependencyAconfigFiles(ctx ModuleContext, mergedAconfigFiles *map[st } }) - for container, aconfigFiles := range *mergedAconfigFiles { + for _, container := range SortedKeys(*mergedAconfigFiles) { + aconfigFiles := (*mergedAconfigFiles)[container] (*mergedAconfigFiles)[container] = mergeAconfigFiles(ctx, container, aconfigFiles, false) } @@ -172,7 +173,8 @@ func aconfigUpdateAndroidBuildActions(ctx ModuleContext) { }) // We only need to set the provider if we have aconfig files. if len(mergedAconfigFiles) > 0 { - for container, aconfigFiles := range mergedAconfigFiles { + for _, container := range SortedKeys(mergedAconfigFiles) { + aconfigFiles := mergedAconfigFiles[container] mergedAconfigFiles[container] = mergeAconfigFiles(ctx, container, aconfigFiles, true) } |