Rename VINTF XML module names

* system_compatibility_matrix/manifest.xml
   => framework_...
* compatibility_matrix/manifest.xml
   => device_...

This is to follow the naming scheme in VINTF
doc.

Test: build all four targets

Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
This commit is contained in:
Yifan Hong 2017-12-13 15:03:51 -08:00
parent 973301af79
commit 43ec6ead28
2 changed files with 13 additions and 8 deletions

View file

@ -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)
@ -53,7 +54,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)
@ -69,7 +71,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)
@ -94,7 +96,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)

View file

@ -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.