diff options
| -rw-r--r-- | compliance/Android.bp | 35 | ||||
| -rw-r--r-- | compliance/notice.go | 6 |
2 files changed, 39 insertions, 2 deletions
diff --git a/compliance/Android.bp b/compliance/Android.bp index a1f2015b0..25f6f8678 100644 --- a/compliance/Android.bp +++ b/compliance/Android.bp @@ -37,3 +37,38 @@ notice_xml { "//visibility:any_system_partition", ], } + +notice_xml { + name: "notice_xml_system_ext", + partition_name: "system_ext", +} + +notice_xml { + name: "notice_xml_system_dlkm", + partition_name: "system_dlkm", +} + +notice_xml { + name: "notice_xml_product", + partition_name: "product", +} + +notice_xml { + name: "notice_xml_odm", + partition_name: "odm", +} + +notice_xml { + name: "notice_xml_odm_dlkm", + partition_name: "odm_dlkm", +} + +notice_xml { + name: "notice_xml_vendor", + partition_name: "vendor", +} + +notice_xml { + name: "notice_xml_vendor_dlkm", + partition_name: "vendor_dlkm", +} diff --git a/compliance/notice.go b/compliance/notice.go index 0d5fce3fc..c5b0fbebe 100644 --- a/compliance/notice.go +++ b/compliance/notice.go @@ -91,8 +91,10 @@ func (nx *NoticeXmlModule) GenerateAndroidBuildActions(ctx android.ModuleContext nx.outputFile = output.OutputPath - installPath := android.PathForModuleInPartitionInstall(ctx, nx.props.Partition_name, "etc") - ctx.PackageFile(installPath, "NOTICE.xml.gz", nx.outputFile) + if android.Bool(ctx.Config().ProductVariables().UseSoongNoticeXML) { + installPath := android.PathForModuleInPartitionInstall(ctx, nx.props.Partition_name, "etc") + ctx.InstallFile(installPath, "NOTICE.xml.gz", nx.outputFile) + } } func (nx *NoticeXmlModule) AndroidMkEntries() []android.AndroidMkEntries { |