diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/android/module.go b/android/module.go index 695616785..b689a87f2 100644 --- a/android/module.go +++ b/android/module.go @@ -97,6 +97,8 @@ type EarlyModuleContext interface { GlobFiles(globPattern string, excludes []string) Paths IsSymlink(path Path) bool Readlink(path Path) string + + Namespace() *Namespace } // BaseModuleContext is the same as blueprint.BaseModuleContext except that Config() returns @@ -219,7 +221,6 @@ type ModuleContext interface { VisitAllModuleVariants(visit func(Module)) GetMissingDependencies() []string - Namespace() blueprint.Namespace } type Module interface { @@ -1187,7 +1188,7 @@ func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) { var deps Paths - namespacePrefix := ctx.Namespace().(*Namespace).id + namespacePrefix := ctx.Namespace().id if namespacePrefix != "" { namespacePrefix = namespacePrefix + "-" } @@ -1331,7 +1332,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) suffix = append(suffix, ctx.Arch().ArchType.String()) } if apex, ok := m.module.(ApexModule); ok && !apex.IsForPlatform() { - suffix = append(suffix, apex.ApexName()) + suffix = append(suffix, apex.ApexVariationName()) } ctx.Variable(pctx, "moduleDesc", desc) @@ -1498,6 +1499,10 @@ func (e *earlyModuleContext) SystemExtSpecific() bool { return e.kind == systemExtSpecificModule } +func (e *earlyModuleContext) Namespace() *Namespace { + return e.EarlyModuleContext.Namespace().(*Namespace) +} + type baseModuleContext struct { bp blueprint.BaseModuleContext earlyModuleContext |