summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-09-10 00:06:13 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-09-10 00:06:13 +0000
commit4f35976c87c24f4584ff8f86298c63c75f063be4 (patch)
treeb5dea6bc914be435fa57bca562c6b69050673201 /apex/builder.go
parent74fe471e7ac2f7707c0b4e85c4175433527f8fa0 (diff)
parent41f637d6533d75823fbaf878eed2b3017cfe1a9a (diff)
Merge "Notice files for prebuilt_etc are included in APEX"
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/builder.go b/apex/builder.go
index 22cd69bf4..26afb04d2 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -286,6 +286,10 @@ func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName st
return true
})
+ for _, fi := range a.filesInfo {
+ noticeFiles = append(noticeFiles, fi.noticeFiles...)
+ }
+
if len(noticeFiles) == 0 {
return android.NoticeOutputs{}
}