commit 51be69f063df38eff819cb9c2bfc2f8bdf84724c
author Yifan Hong <elsk@google.com> Tue Jan 14 13:22:17 2020 -0800
committer Yifan Hong <elsk@google.com> Tue Jan 14 14:24:51 2020 -0800
tree 9f0ce297778318273c4ed54a6f6e5cac915fed68
parent 02e7851e02b00c35d19d1ed2af311957b520c238

device_(manifest|matrix).xml -> vendor_*

Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 0400856..99e4e43 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1034,7 +1034,7 @@
 # variables being set.
 define auto-included-modules
   $(if $(BOARD_VNDK_VERSION),vndk_package) \
-  $(if $(DEVICE_MANIFEST_FILE),device_manifest.xml) \
+  $(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \
   $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \
   $(if $(ODM_MANIFEST_SKUS),$(foreach sku, $(ODM_MANIFEST_SKUS),odm_manifest_$(sku).xml)) \