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

Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373

Change-Id: Ifbfd71ff4416b07742e70c9d9aba523d60af1d2b
This commit is contained in:
Treehugger Robot
2020-09-10 00:30:29 +00:00
committed by Automerger Merge Worker
parent fbd7372401 4f35976c87
commit 410b20dba2
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

@@ -1291,6 +1291,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 {
@@ -1306,6 +1308,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{}
} }