tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Notice files for prebuilt_etc are included in APEX"

Browse source
This commit is contained in:
Treehugger Robot 2020-09-10 00:06:13 +00:00 committed by Gerrit Code Review
commit 4f35976c87
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apex/apex.go
View file

@ -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
}

4
apex/builder.go
View file

@ -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{}
}