Use VisitDirectDepsProxy in aconfigUpdateAndroidBuildActions,
GatherPackagingSpecsWithFilter and checkClasspathFragments.
Bug: 377723687
Test: Check the ninja and mk files.
Change-Id: I620cb94a7304cf117142e5e88d8c2a16101dd9d6
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go
index b902f8b..210a656 100644
--- a/android/aconfig_providers.go
+++ b/android/aconfig_providers.go
@@ -107,7 +107,7 @@
mergedAconfigFiles := make(map[string]Paths)
mergedModeInfos := make(map[string]ModeInfo)
- ctx.VisitDirectDeps(func(module Module) {
+ ctx.VisitDirectDepsProxy(func(module ModuleProxy) {
if aconfig_dep, ok := OtherModuleProvider(ctx, module, CodegenInfoProvider); ok && len(aconfig_dep.ModeInfos) > 0 {
maps.Copy(mergedModeInfos, aconfig_dep.ModeInfos)
}
diff --git a/android/base_module_context.go b/android/base_module_context.go
index 719d6d5..ab28676 100644
--- a/android/base_module_context.go
+++ b/android/base_module_context.go
@@ -266,7 +266,7 @@
return b.bp.OtherModuleDir(getWrappedModule(m))
}
func (b *baseModuleContext) OtherModuleErrorf(m blueprint.Module, fmt string, args ...interface{}) {
- b.bp.OtherModuleErrorf(m, fmt, args...)
+ b.bp.OtherModuleErrorf(getWrappedModule(m), fmt, args...)
}
func (b *baseModuleContext) OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag {
return b.bp.OtherModuleDependencyTag(getWrappedModule(m))
diff --git a/android/packaging.go b/android/packaging.go
index 98c85fa..c4cc6b9 100644
--- a/android/packaging.go
+++ b/android/packaging.go
@@ -474,7 +474,7 @@
return false
}
- ctx.VisitDirectDeps(func(child Module) {
+ ctx.VisitDirectDepsProxy(func(child ModuleProxy) {
depTag := ctx.OtherModuleDependencyTag(child)
if pi, ok := depTag.(PackagingItem); !ok || !pi.IsPackagingItem() {
return