Fix: PathsForModuleSrc does not work for a replaced dependency
PathsForModuleSrc does not work if a source module is replaced with a
prebuilt module. This is because the function uses GetDirectDepWithTag
with the name of the original source module. Since the dependency is
replaced and the prebuilt module has the name "prebuilt_<name>", the
search always fails.
Fixing this by re-implementing GetDirectDep* functions inside Soong
using VisitDirectDep.
Bug: 130627486
Test: m
Merged-In: I68d52668283c429d5e93c7f2c81f6a8db1f24893
Change-Id: I68d52668283c429d5e93c7f2c81f6a8db1f24893
(cherry picked from commit f2976304f7
)
This commit is contained in:
@@ -1034,6 +1034,39 @@ func (a *androidModuleContext) validateAndroidModule(module blueprint.Module) Mo
|
|||||||
return aModule
|
return aModule
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *androidModuleContext) getDirectDepInternal(name string, tag blueprint.DependencyTag) (blueprint.Module, blueprint.DependencyTag) {
|
||||||
|
type dep struct {
|
||||||
|
mod blueprint.Module
|
||||||
|
tag blueprint.DependencyTag
|
||||||
|
}
|
||||||
|
var deps []dep
|
||||||
|
a.VisitDirectDepsBlueprint(func(m blueprint.Module) {
|
||||||
|
if aModule, _ := m.(Module); aModule != nil && aModule.base().BaseModuleName() == name {
|
||||||
|
returnedTag := a.ModuleContext.OtherModuleDependencyTag(aModule)
|
||||||
|
if tag == nil || returnedTag == tag {
|
||||||
|
deps = append(deps, dep{aModule, returnedTag})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if len(deps) == 1 {
|
||||||
|
return deps[0].mod, deps[0].tag
|
||||||
|
} else if len(deps) >= 2 {
|
||||||
|
panic(fmt.Errorf("Multiple dependencies having same BaseModuleName() %q found from %q",
|
||||||
|
name, a.ModuleName()))
|
||||||
|
} else {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *androidModuleContext) GetDirectDepWithTag(name string, tag blueprint.DependencyTag) blueprint.Module {
|
||||||
|
m, _ := a.getDirectDepInternal(name, tag)
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *androidModuleContext) GetDirectDep(name string) (blueprint.Module, blueprint.DependencyTag) {
|
||||||
|
return a.getDirectDepInternal(name, nil)
|
||||||
|
}
|
||||||
|
|
||||||
func (a *androidModuleContext) VisitDirectDepsBlueprint(visit func(blueprint.Module)) {
|
func (a *androidModuleContext) VisitDirectDepsBlueprint(visit func(blueprint.Module)) {
|
||||||
a.ModuleContext.VisitDirectDeps(visit)
|
a.ModuleContext.VisitDirectDeps(visit)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user