StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notice files for prebuilt_etc are included in APEX

Browse Source 
This change fixes a bug that notice files for some module type (e.g.
prebuilt_etc) were not included in APEX. This happened because we relied
on WalkPayloadDeps which actually doesn't traverse module types that
don't implement ApexModule interface. prebuilt_etc is one such module
type. Fixing the problem by also iterating the filesInfo array which
has info about all modules that are included in the APEX.

Bug: 166575301
Test: m com.android.tzdata and inspect the built artifact.
NOTICE.html.gz is there.

Change-Id: Iceb055b60184aef2a3e65e44680304853eb79a53
This commit is contained in:
Jiyong Park
2020-09-09 13:18:02 +09:00
parent daf735287b
commit 41f637d653
2 changed files with 7 additions and 0 deletions
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 overriddenPackageName string // only for apps
isJniLib bool isJniLib bool
noticeFiles android.Paths
} }
func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidMkModuleName string, installDir string, class apexFileClass, module android.Module) apexFile { 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.requiredModuleNames = module.RequiredModuleNames()
ret.targetRequiredModuleNames = module.TargetRequiredModuleNames() ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()
ret.hostRequiredModuleNames = module.HostRequiredModuleNames() ret.hostRequiredModuleNames = module.HostRequiredModuleNames()
ret.noticeFiles = module.NoticeFiles()
} }
return ret return ret
} }

4
apex/builder.go
View File

@@ -286,6 +286,10 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st
return true return true
}) })
for _, fi := range a.filesInfo {
noticeFiles = append(noticeFiles, fi.noticeFiles...)
}
if len(noticeFiles) == 0 { if len(noticeFiles) == 0 {
return android.NoticeOutputs{} return android.NoticeOutputs{}
} }