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

Merge "Fix some non-determinism in aconfigMerge operation" into main am: 1c3675503c

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

Change-Id: I578922a297a4c8c2b3c418444907c3e5be903b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-28 23:49:14 +00:00
committed by Automerger Merge Worker
parent 292c596a54 1c3675503c
commit 55b3c6a4c7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/aconfig_providers.go
View File

@@ -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) (*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. // We only need to set the provider if we have aconfig files.
if len(mergedAconfigFiles) > 0 { if len(mergedAconfigFiles) > 0 {
for container, aconfigFiles := range mergedAconfigFiles { for _, container := range SortedKeys(mergedAconfigFiles) {
aconfigFiles := mergedAconfigFiles[container]
mergedAconfigFiles[container] = mergeAconfigFiles(ctx, container, aconfigFiles, true) mergedAconfigFiles[container] = mergeAconfigFiles(ctx, container, aconfigFiles, true)
} }