diff options
| -rw-r--r-- | common/module.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/common/module.go b/common/module.go index 3cb4c09d..d420fe1f 100644 --- a/common/module.go +++ b/common/module.go @@ -254,12 +254,9 @@ func (a *AndroidModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) { allInstalledFiles := []string{} allCheckbuildFiles := []string{} ctx.VisitAllModuleVariants(func(module blueprint.Module) { - if androidModule, ok := module.(AndroidModule); ok { - files := androidModule.base().installFiles - allInstalledFiles = append(allInstalledFiles, files...) - files = androidModule.base().checkbuildFiles - allCheckbuildFiles = append(allCheckbuildFiles, files...) - } + a := module.(AndroidModule).base() + allInstalledFiles = append(allInstalledFiles, a.installFiles...) + allCheckbuildFiles = append(allCheckbuildFiles, a.checkbuildFiles...) }) deps := []string{} @@ -329,13 +326,13 @@ func (a *AndroidModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) { return } + a.installFiles = append(a.installFiles, androidCtx.installFiles...) + a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...) + a.generateModuleTarget(ctx) if ctx.Failed() { return } - - a.installFiles = append(a.installFiles, androidCtx.installFiles...) - a.checkbuildFiles = append(a.checkbuildFiles, androidCtx.checkbuildFiles...) } type androidBaseContextImpl struct { |