Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543

Change-Id: I07c65054fe5a569b557b10fb885c0efe735841a3

core/main.mk

@@ -1031,7 +1031,7 @@ endef
 # 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)) \
 

target/board/Android.mk

@@ -34,7 +34,7 @@ endif
 ifdef DEVICE_MANIFEST_FILE
 # $(DEVICE_MANIFEST_FILE) can be a list of files
 include $(CLEAR_VARS)
-LOCAL_MODULE        := device_manifest.xml
+LOCAL_MODULE        := vendor_manifest.xml
 LOCAL_MODULE_STEM   := manifest.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)/etc/vintf

target/product/base_vendor.mk

@@ -72,7 +72,7 @@ PRODUCT_PACKAGES += \
 
 # VINTF data for vendor image
 PRODUCT_PACKAGES += \
-    device_compatibility_matrix.xml \
+    vendor_compatibility_matrix.xml \
 
 # Packages to update the recovery partition, which will be installed on
 # /vendor. TODO(b/141648565): Don't install these unless they're needed.