commit b321665b9da4884560ea266908ed50516b33c630
author Yifan Hong <elsk@google.com> Wed Feb 13 16:32:40 2019 -0800
committer Yifan Hong <elsk@google.com> Tue Feb 19 12:37:50 2019 -0800
tree 36f2f867835da9db4694e3b672cd46466e4e94c8
parent da4ee462c72b7ebeac7aaf0142986caa5fc1fc0a

Build ODM manifests and fragments for each SKU.

In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 610ab28..eca7cdb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1046,6 +1046,8 @@
 define auto-included-modules
   $(if $(BOARD_VNDK_VERSION),vndk_package) \
   $(if $(DEVICE_MANIFEST_FILE),device_manifest.xml) \
+  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \
+  $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \
 
 endef