diff options
| author | 2024-11-11 22:29:30 +0000 | |
|---|---|---|
| committer | 2024-11-12 03:48:18 +0000 | |
| commit | ac483e081c08491ad5385d8e1de70c91121ac975 (patch) | |
| tree | fac797fc656671a04c683b79fb5d18a5e38a75d4 | |
| parent | d3228acdc8658e7bd9ef9662c425822ae55fdebf (diff) | |
Use VisitDirectDepsProxy in aconfigUpdateAndroidBuildActions,
GatherPackagingSpecsWithFilter and checkClasspathFragments.
Bug: 377723687
Test: Check the ninja and mk files.
Change-Id: I620cb94a7304cf117142e5e88d8c2a16101dd9d6
| -rw-r--r-- | android/aconfig_providers.go | 2 | ||||
| -rw-r--r-- | android/base_module_context.go | 2 | ||||
| -rw-r--r-- | android/packaging.go | 2 | ||||
| -rw-r--r-- | apex/apex.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index b902f8be5..210a65638 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -107,7 +107,7 @@ func aconfigUpdateAndroidBuildActions(ctx ModuleContext) { 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 719d6d5bf..ab28676ce 100644 --- a/android/base_module_context.go +++ b/android/base_module_context.go @@ -266,7 +266,7 @@ func (b *baseModuleContext) OtherModuleDir(m blueprint.Module) string { 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 98c85fa0c..c4cc6b98c 100644 --- a/android/packaging.go +++ b/android/packaging.go @@ -474,7 +474,7 @@ func (p *PackagingBase) GatherPackagingSpecsWithFilter(ctx ModuleContext, filter 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 diff --git a/apex/apex.go b/apex/apex.go index 04b5a078e..3e1b41df6 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2635,7 +2635,7 @@ func (a *apexBundle) checkUpdatable(ctx android.ModuleContext) { // checkClasspathFragments enforces that all classpath fragments in deps generate classpaths.proto config. func (a *apexBundle) checkClasspathFragments(ctx android.ModuleContext) { - ctx.VisitDirectDeps(func(module android.Module) { + ctx.VisitDirectDepsProxy(func(module android.ModuleProxy) { if tag := ctx.OtherModuleDependencyTag(module); tag == bcpfTag || tag == sscpfTag { info, _ := android.OtherModuleProvider(ctx, module, java.ClasspathFragmentProtoContentInfoProvider) if !info.ClasspathFragmentProtoGenerated { |