Add product_compatibitility_matrix.xml to base_product.

The module refers to framework compatibitlity matrix
that defined OEM modules.

Also, renamed framework_compatibility_matrix.xml
to system_compatibility_matrix.xml, since
framework_compatibility_matrix.xml consists of both
system and product compatibility matrices. This fixes
mainline build.

Test: build
Test: boot device with product compatibility matrix

Bug: 120600021
Change-Id: Ibfb12578c3ec77b6baede4eed852074e08022119
This commit is contained in:
Yifan Hong
2019-01-22 15:49:53 -08:00
parent 2ec9fcd951
commit 28ee89dda1
2 changed files with 2 additions and 1 deletions

View File

@@ -18,3 +18,4 @@
PRODUCT_PACKAGES += \
healthd \
ModuleMetadata \
product_compatibility_matrix.xml \

View File

@@ -271,7 +271,7 @@ PRODUCT_PACKAGES += \
# VINTF data for system image
PRODUCT_PACKAGES += \
framework_manifest.xml \
framework_compatibility_matrix.xml \
system_compatibility_matrix.xml \
ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)