diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/android/module.go b/android/module.go index 11e9e917..6a796227 100644 --- a/android/module.go +++ b/android/module.go @@ -849,14 +849,6 @@ func (a *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) } if a.Enabled() { - a.module.GenerateAndroidBuildActions(ctx) - if ctx.Failed() { - return - } - - a.installFiles = append(a.installFiles, ctx.installFiles...) - a.checkbuildFiles = append(a.checkbuildFiles, ctx.checkbuildFiles...) - notice := proptools.StringDefault(a.commonProperties.Notice, "NOTICE") if m := SrcIsModule(notice); m != "" { a.noticeFile = ctx.ExpandOptionalSource(¬ice, "notice") @@ -864,6 +856,14 @@ func (a *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) noticePath := filepath.Join(ctx.ModuleDir(), notice) a.noticeFile = ExistentPathForSource(ctx, noticePath) } + + a.module.GenerateAndroidBuildActions(ctx) + if ctx.Failed() { + return + } + + a.installFiles = append(a.installFiles, ctx.installFiles...) + a.checkbuildFiles = append(a.checkbuildFiles, ctx.checkbuildFiles...) } if a == ctx.FinalModule().(Module).base() { |