Build notice files from license metadata.

Switch from generate-notice-files.py and mergenotice.py to htmlnotice.

Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I6cac049d24f35ec358c6f341a04f4ba6161703bf
This commit is contained in:
Bob Badour
2022-03-29 14:43:28 -07:00
parent 76ff96f885
commit 43c2dcaef6
10 changed files with 28 additions and 638 deletions

View File

@@ -414,8 +414,8 @@ type apexBundle struct {
// Processed file_contexts files
fileContexts android.WritablePath
// Struct holding the merged notice file paths in different formats
mergedNotices android.NoticeOutputs
// Path to notice file in html.gz format.
htmlGzNotice android.WritablePath
// The built APEX file. This is the main product.
// Could be .apex or .capex
@@ -487,11 +487,10 @@ const (
// for each of the files in case when the APEX is flattened.
type apexFile struct {
// buildFile is put in the installDir inside the APEX.
builtFile android.Path
noticeFiles android.Paths
installDir string
customStem string
symlinks []string // additional symlinks
builtFile android.Path
installDir string
customStem string
symlinks []string // additional symlinks
// Info for Android.mk Module name of `module` in AndroidMk. Note the generated AndroidMk
// module for apexFile is named something like <AndroidMk module name>.<apex name>[<apex
@@ -528,7 +527,6 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidM
module: module,
}
if module != nil {
ret.noticeFiles = module.NoticeFiles()
ret.moduleDir = ctx.OtherModuleDir(module)
ret.requiredModuleNames = module.RequiredModuleNames()
ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()