Convert Visit*Deps from blueprint.Module to android.Module
Also adds checks that the dependencies are android.Modules and
are not disabled.
Test: m checkbuild
Change-Id: I05e945f38915d49cd3c0ab72a86576949bc7eff2
diff --git a/android/defaults.go b/android/defaults.go
index 4bf872e..c704529 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -131,7 +131,7 @@
func defaultsMutator(ctx TopDownMutatorContext) {
if defaultable, ok := ctx.Module().(Defaultable); ok && len(defaultable.defaults().Defaults) > 0 {
var defaultsList []Defaults
- ctx.WalkDeps(func(module, parent blueprint.Module) bool {
+ ctx.WalkDeps(func(module, parent Module) bool {
if ctx.OtherModuleDependencyTag(module) == DefaultsDepTag {
if defaults, ok := module.(Defaults); ok {
defaultsList = append(defaultsList, defaults)
diff --git a/android/module.go b/android/module.go
index 0fada78..4d4462b 100644
--- a/android/module.go
+++ b/android/module.go
@@ -108,11 +108,11 @@
ModuleSubDir() string
- VisitDirectDeps(visit func(blueprint.Module))
- VisitDirectDepsIf(pred func(blueprint.Module) bool, visit func(blueprint.Module))
- VisitDepsDepthFirst(visit func(blueprint.Module))
- VisitDepsDepthFirstIf(pred func(blueprint.Module) bool, visit func(blueprint.Module))
- WalkDeps(visit func(blueprint.Module, blueprint.Module) bool)
+ VisitDirectDeps(visit func(Module))
+ VisitDirectDepsIf(pred func(Module) bool, visit func(Module))
+ VisitDepsDepthFirst(visit func(Module))
+ VisitDepsDepthFirstIf(pred func(Module) bool, visit func(Module))
+ WalkDeps(visit func(Module, Module) bool)
Variable(pctx blueprint.PackageContext, name, value string)
Rule(pctx blueprint.PackageContext, name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule
@@ -663,9 +663,89 @@
func (a *androidModuleContext) AddMissingDependencies(deps []string) {
if deps != nil {
a.missingDeps = append(a.missingDeps, deps...)
+ a.missingDeps = FirstUniqueStrings(a.missingDeps)
}
}
+func (a *androidModuleContext) validateAndroidModule(module blueprint.Module) Module {
+ aModule, _ := module.(Module)
+ if aModule == nil {
+ a.ModuleErrorf("module %q not an android module", a.OtherModuleName(aModule))
+ return nil
+ }
+
+ if !aModule.Enabled() {
+ if a.AConfig().AllowMissingDependencies() {
+ a.AddMissingDependencies([]string{a.OtherModuleName(aModule)})
+ } else {
+ a.ModuleErrorf("depends on disabled module %q", a.OtherModuleName(aModule))
+ }
+ return nil
+ }
+
+ return aModule
+}
+
+func (a *androidModuleContext) VisitDirectDeps(visit func(Module)) {
+ a.ModuleContext.VisitDirectDeps(func(module blueprint.Module) {
+ if aModule := a.validateAndroidModule(module); aModule != nil {
+ visit(aModule)
+ }
+ })
+}
+
+func (a *androidModuleContext) VisitDirectDepsIf(pred func(Module) bool, visit func(Module)) {
+ a.ModuleContext.VisitDirectDepsIf(
+ // pred
+ func(module blueprint.Module) bool {
+ if aModule := a.validateAndroidModule(module); aModule != nil {
+ return pred(aModule)
+ } else {
+ return false
+ }
+ },
+ // visit
+ func(module blueprint.Module) {
+ visit(module.(Module))
+ })
+}
+
+func (a *androidModuleContext) VisitDepsDepthFirst(visit func(Module)) {
+ a.ModuleContext.VisitDepsDepthFirst(func(module blueprint.Module) {
+ if aModule := a.validateAndroidModule(module); aModule != nil {
+ visit(aModule)
+ }
+ })
+}
+
+func (a *androidModuleContext) VisitDepsDepthFirstIf(pred func(Module) bool, visit func(Module)) {
+ a.ModuleContext.VisitDepsDepthFirstIf(
+ // pred
+ func(module blueprint.Module) bool {
+ if aModule := a.validateAndroidModule(module); aModule != nil {
+ return pred(aModule)
+ } else {
+ return false
+ }
+ },
+ // visit
+ func(module blueprint.Module) {
+ visit(module.(Module))
+ })
+}
+
+func (a *androidModuleContext) WalkDeps(visit func(Module, Module) bool) {
+ a.ModuleContext.WalkDeps(func(child, parent blueprint.Module) bool {
+ childAndroidModule := a.validateAndroidModule(child)
+ parentAndroidModule := a.validateAndroidModule(parent)
+ if childAndroidModule != nil && parentAndroidModule != nil {
+ return visit(childAndroidModule, parentAndroidModule)
+ } else {
+ return false
+ }
+ })
+}
+
func (a *androidBaseContextImpl) Target() Target {
return a.target
}
diff --git a/android/mutator.go b/android/mutator.go
index b485940..afff700 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -123,11 +123,11 @@
GetDirectDepWithTag(name string, tag blueprint.DependencyTag) blueprint.Module
GetDirectDep(name string) (blueprint.Module, blueprint.DependencyTag)
- VisitDirectDeps(visit func(blueprint.Module))
- VisitDirectDepsIf(pred func(blueprint.Module) bool, visit func(blueprint.Module))
- VisitDepsDepthFirst(visit func(blueprint.Module))
- VisitDepsDepthFirstIf(pred func(blueprint.Module) bool, visit func(blueprint.Module))
- WalkDeps(visit func(blueprint.Module, blueprint.Module) bool)
+ VisitDirectDeps(visit func(Module))
+ VisitDirectDepsIf(pred func(Module) bool, visit func(Module))
+ VisitDepsDepthFirst(visit func(Module))
+ VisitDepsDepthFirstIf(pred func(Module) bool, visit func(Module))
+ WalkDeps(visit func(Module, Module) bool)
}
type androidTopDownMutatorContext struct {
@@ -191,3 +191,63 @@
m.DepsMutator(ctx)
}
}
+
+func (a *androidTopDownMutatorContext) VisitDirectDeps(visit func(Module)) {
+ a.TopDownMutatorContext.VisitDirectDeps(func(module blueprint.Module) {
+ if aModule, _ := module.(Module); aModule != nil {
+ visit(aModule)
+ }
+ })
+}
+
+func (a *androidTopDownMutatorContext) VisitDirectDepsIf(pred func(Module) bool, visit func(Module)) {
+ a.TopDownMutatorContext.VisitDirectDepsIf(
+ // pred
+ func(module blueprint.Module) bool {
+ if aModule, _ := module.(Module); aModule != nil {
+ return pred(aModule)
+ } else {
+ return false
+ }
+ },
+ // visit
+ func(module blueprint.Module) {
+ visit(module.(Module))
+ })
+}
+
+func (a *androidTopDownMutatorContext) VisitDepsDepthFirst(visit func(Module)) {
+ a.TopDownMutatorContext.VisitDepsDepthFirst(func(module blueprint.Module) {
+ if aModule, _ := module.(Module); aModule != nil {
+ visit(aModule)
+ }
+ })
+}
+
+func (a *androidTopDownMutatorContext) VisitDepsDepthFirstIf(pred func(Module) bool, visit func(Module)) {
+ a.TopDownMutatorContext.VisitDepsDepthFirstIf(
+ // pred
+ func(module blueprint.Module) bool {
+ if aModule, _ := module.(Module); aModule != nil {
+ return pred(aModule)
+ } else {
+ return false
+ }
+ },
+ // visit
+ func(module blueprint.Module) {
+ visit(module.(Module))
+ })
+}
+
+func (a *androidTopDownMutatorContext) WalkDeps(visit func(Module, Module) bool) {
+ a.TopDownMutatorContext.WalkDeps(func(child, parent blueprint.Module) bool {
+ childAndroidModule, _ := child.(Module)
+ parentAndroidModule, _ := parent.(Module)
+ if childAndroidModule != nil && parentAndroidModule != nil {
+ return visit(childAndroidModule, parentAndroidModule)
+ } else {
+ return false
+ }
+ })
+}
diff --git a/android/prebuilt.go b/android/prebuilt.go
index f61a0dd..f29f865 100644
--- a/android/prebuilt.go
+++ b/android/prebuilt.go
@@ -109,7 +109,7 @@
p.properties.UsePrebuilt = p.usePrebuilt(ctx, nil)
}
} else if s, ok := ctx.Module().(Module); ok {
- ctx.VisitDirectDeps(func(m blueprint.Module) {
+ ctx.VisitDirectDeps(func(m Module) {
if ctx.OtherModuleDependencyTag(m) == prebuiltDepTag {
p := m.(PrebuiltInterface).Prebuilt()
if p.usePrebuilt(ctx, s) {