Add VisitDirectDepsIgnoreBlueprint
This method allows dependencies on non-Android modules, which it ignores
in strict mode, rather than flagging the dependency as an error.
Bug: none
Test: manual
Change-Id: I9575e46638fa8ffc69c8935b1b65aab37ceab3c3
diff --git a/android/aconfig_providers.go b/android/aconfig_providers.go
index 4ba1a88..68fff58 100644
--- a/android/aconfig_providers.go
+++ b/android/aconfig_providers.go
@@ -49,13 +49,7 @@
if *mergedAconfigFiles == nil {
*mergedAconfigFiles = make(map[string]Paths)
}
- 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
- }
-
+ ctx.VisitDirectDepsIgnoreBlueprint(func(module Module) {
if dep, _ := OtherModuleProvider(ctx, module, AconfigDeclarationsProviderKey); dep.IntermediateCacheOutputPath != nil {
(*mergedAconfigFiles)[dep.Container] = append((*mergedAconfigFiles)[dep.Container], dep.IntermediateCacheOutputPath)
return