commit 3b7560bf881e6cd4579b984d3a1ebd9669513319
author Jaekyun Seok <jaekyun@google.com> Wed Apr 19 15:26:47 2017 +0900
committer Jaekyun Seok <jaekyun@google.com> Fri Apr 28 16:29:17 2017 +0900
tree e9c6567068922e0c83413103f7415b4cfcfd7445
parent e5181610d44635a4c443f56905aeb517f0db28f7

Split vendor license notices into vendor partition

Xml files will be generated instead of html files, and then Settings
will generate html file on runtime from xml files of partitions.

Test: build succeeded and tested on sailfish
Bug: 37099941
Change-Id: Id7899381a537b1947cbb6164ed2b4a98492334af

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index b892ce0..da0e9f4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1015,9 +1015,9 @@
 droid_targets: apps_only
 
 # Combine the NOTICE files for a apps_only build
-$(eval $(call combine-notice-files, \
+$(eval $(call combine-notice-files, html, \
     $(target_notice_file_txt), \
-    $(target_notice_file_html), \
+    $(target_notice_file_html_or_xml), \
     "Notices for files for apps:", \
     $(TARGET_OUT_NOTICE_FILES), \
     $(apps_only_installed_files)))