summaryrefslogtreecommitdiff
path: root/aconfig
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-02-25 13:59:16 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-25 13:59:16 -0800
commit3612d39a3714c477be6f94cb21a2856eab3e9388 (patch)
treef7c4fff214a2bcc7ac84ac1971a6b61188b48fdf /aconfig
parent3b59ef66c197d9c7c6e6c1b522c0b4f99cd78f8f (diff)
parent43ce003b339cc9ca8533d0df1e5f6d87861d77d3 (diff)
Merge "Convert the following singletons to use ModuleProxy:" into main am: d272a622e9 am: 43ce003b33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3501908 Change-Id: Ic2129850f7030109020d7d19148c884c920102df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'aconfig')
-rw-r--r--aconfig/exported_java_aconfig_library.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/aconfig/exported_java_aconfig_library.go b/aconfig/exported_java_aconfig_library.go
index 63d824a88..ffb2a0cbe 100644
--- a/aconfig/exported_java_aconfig_library.go
+++ b/aconfig/exported_java_aconfig_library.go
@@ -15,8 +15,9 @@
package aconfig
import (
- "android/soong/android"
"strconv"
+
+ "android/soong/android"
)
func ExportedJavaDeclarationsLibraryFactory() android.Singleton {
@@ -30,7 +31,7 @@ type exportedJavaDeclarationsLibrarySingleton struct {
func (this *exportedJavaDeclarationsLibrarySingleton) GenerateBuildActions(ctx android.SingletonContext) {
// Find all of the aconfig_declarations modules
var cacheFiles android.Paths
- ctx.VisitAllModules(func(module android.Module) {
+ ctx.VisitAllModuleProxies(func(module android.ModuleProxy) {
decl, ok := android.OtherModuleProvider(ctx, module, android.AconfigDeclarationsProviderKey)
if !ok {
return