diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apex/apex.go b/apex/apex.go index cb88f02f5..6d8a67a5c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -414,8 +414,8 @@ type apexBundle struct { // Processed file_contexts files fileContexts android.WritablePath - // Path to notice file in html.gz format. - htmlGzNotice android.WritablePath + // Struct holding the merged notice file paths in different formats + mergedNotices android.NoticeOutputs // The built APEX file. This is the main product. // Could be .apex or .capex @@ -487,10 +487,11 @@ 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 - installDir string - customStem string - symlinks []string // additional symlinks + builtFile android.Path + noticeFiles android.Paths + 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 @@ -527,6 +528,7 @@ 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() |