diff options
| -rw-r--r-- | android/aconfig_providers.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go index ddebec343..11fc6600d 100644 --- a/android/aconfig_providers.go +++ b/android/aconfig_providers.go @@ -49,7 +49,13 @@ func CollectDependencyAconfigFiles(ctx ModuleContext, mergedAconfigFiles *map[st if *mergedAconfigFiles == nil { *mergedAconfigFiles = make(map[string]Paths) } - ctx.VisitDirectDeps(func(module Module) { + ctx.VisitDirectDepsBlueprint(func(module blueprint.Module) { + // Walk our direct dependencies, ignoring blueprint Modules and disabled Android Modules. + aModule, _ := module.(Module) + if aModule == nil || !aModule.Enabled() { + return + } + if dep, _ := OtherModuleProvider(ctx, module, AconfigDeclarationsProviderKey); dep.IntermediateCacheOutputPath != nil { (*mergedAconfigFiles)[dep.Container] = append((*mergedAconfigFiles)[dep.Container], dep.IntermediateCacheOutputPath) return |