From 28ee89dda1c0d9213bdf813551fe59bf529f107c Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 22 Jan 2019 15:49:53 -0800 Subject: [PATCH] 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 --- target/product/base_product.mk | 1 + target/product/base_system.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/base_product.mk b/target/product/base_product.mk index bd53fb10d9..1ed9e8368f 100644 --- a/target/product/base_product.mk +++ b/target/product/base_product.mk @@ -18,3 +18,4 @@ PRODUCT_PACKAGES += \ healthd \ ModuleMetadata \ + product_compatibility_matrix.xml \ diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 4a3ae4d85a..b49adfcc56 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -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)