diff options
| author | 2020-09-10 00:06:13 +0000 | |
|---|---|---|
| committer | 2020-09-10 00:06:13 +0000 | |
| commit | 4f35976c87c24f4584ff8f86298c63c75f063be4 (patch) | |
| tree | b5dea6bc914be435fa57bca562c6b69050673201 /apex/apex.go | |
| parent | 74fe471e7ac2f7707c0b4e85c4175433527f8fa0 (diff) | |
| parent | 41f637d6533d75823fbaf878eed2b3017cfe1a9a (diff) | |
Merge "Notice files for prebuilt_etc are included in APEX"
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 62d91da86..c95ee94a7 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1189,6 +1189,8 @@ type apexFile struct { overriddenPackageName string // only for apps isJniLib bool + + noticeFiles android.Paths } 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.targetRequiredModuleNames = module.TargetRequiredModuleNames() ret.hostRequiredModuleNames = module.HostRequiredModuleNames() + ret.noticeFiles = module.NoticeFiles() } return ret } |