Merge "Add product_compatibitility_matrix.xml to base_product." am: bf21932408 am: ba52952af3

am: 0316dd616a

Change-Id: I46beb08c1702eb56ab3202cbc1d69b73e3773cf5
This commit is contained in:
Yifan Hong 2019-01-28 20:50:50 -08:00 committed by android-build-merger
commit 1d9f2bbaaa
2 changed files with 2 additions and 1 deletions

View File

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

View File

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