diff options
| -rw-r--r-- | apex/apex.go | 3 | ||||
| -rw-r--r-- | apex/builder.go | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 62d91da86..c95ee94a7 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1189,6 +1189,8 @@ type apexFile struct { overriddenPackageName string // only for apps isJniLib bool + + noticeFiles android.Paths } func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidMkModuleName string, installDir string, class apexFileClass, module android.Module) apexFile { @@ -1204,6 +1206,7 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidM ret.requiredModuleNames = module.RequiredModuleNames() ret.targetRequiredModuleNames = module.TargetRequiredModuleNames() ret.hostRequiredModuleNames = module.HostRequiredModuleNames() + ret.noticeFiles = module.NoticeFiles() } return ret } diff --git a/apex/builder.go b/apex/builder.go index 22cd69bf4..26afb04d2 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -286,6 +286,10 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st return true }) + for _, fi := range a.filesInfo { + noticeFiles = append(noticeFiles, fi.noticeFiles...) + } + if len(noticeFiles) == 0 { return android.NoticeOutputs{} } |