diff options
| author | 2022-04-02 01:05:50 +0000 | |
|---|---|---|
| committer | 2022-04-02 01:05:50 +0000 | |
| commit | b0489dec232b9656830d5910cc7f270111f6fd4c (patch) | |
| tree | 0f6db3709f29be934ef5f9b226d531d6fecb54d7 /apex/apex.go | |
| parent | f4d7122237cce6df342b512910513880dfef02ae (diff) | |
| parent | 3aae38d451e44d7f12224e938456dfb2fd665ac5 (diff) | |
Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564
Change-Id: I3f2bafea9462d6a6b15bf29884ba64e2353b0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/apex/apex.go b/apex/apex.go index 6d8a67a5c..cb88f02f5 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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() |