Merge "Rename VINTF XML module names" am: d8d276c5a6 am: fcdf772f67

am: d2c5a38dcb

Change-Id: I330b9c4aa322cf27ba4645c3d9a57859cb5f8ae8

target/board/Android.mk

@@ -34,7 +34,8 @@ endif
 ifdef DEVICE_MANIFEST_FILE
 # $(DEVICE_MANIFEST_FILE) can be a list of files
 include $(CLEAR_VARS)
-LOCAL_MODULE        := manifest.xml
+LOCAL_MODULE        := device_manifest.xml
+LOCAL_MODULE_STEM   := manifest.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)
 
@@ -55,7 +56,8 @@ endif
 # Device Compatibility Matrix
 ifdef DEVICE_MATRIX_FILE
 include $(CLEAR_VARS)
-LOCAL_MODULE        := compatibility_matrix.xml
+LOCAL_MODULE        := device_compatibility_matrix.xml
+LOCAL_MODULE_STEM   := compatibility_matrix.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR)
 
@@ -71,7 +73,7 @@ endif
 
 # Framework Manifest
 include $(CLEAR_VARS)
-LOCAL_MODULE        := system_manifest.xml
+LOCAL_MODULE        := framework_manifest.xml
 LOCAL_MODULE_STEM   := manifest.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT)
@@ -96,7 +98,7 @@ BUILT_SYSTEM_MANIFEST := $(LOCAL_BUILT_MODULE)
 
 # Framework Compatibility Matrix
 include $(CLEAR_VARS)
-LOCAL_MODULE        := system_compatibility_matrix.xml
+LOCAL_MODULE        := framework_compatibility_matrix.xml
 LOCAL_MODULE_STEM   := compatibility_matrix.xml
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_PATH   := $(TARGET_OUT)

target/product/embedded.mk

@@ -81,10 +81,13 @@ PRODUCT_PACKAGES += \
     tzdatacheck \
     vndservice \
     vndservicemanager \
-    compatibility_matrix.xml \
-    manifest.xml \
-    system_manifest.xml \
-    system_compatibility_matrix.xml \
+
+# VINTF data
+PRODUCT_PACKAGES += \
+    device_compatibility_matrix.xml \
+    device_manifest.xml \
+    framework_manifest.xml \
+    framework_compatibility_matrix.xml \
 
 # SELinux packages are added as dependencies of the selinux_policy
 # phony package.