Merge "Notice files for prebuilt_etc are included in APEX" am: 4f35976c87

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1421373 Change-Id: Ifbfd71ff4416b07742e70c9d9aba523d60af1d2b
2020-09-10 00:30:29 +00:00
parent fbd7372401 4f35976c87
commit 410b20dba2
2 changed files with 7 additions and 0 deletions
--- 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{}
 	}