From 1b327559912404837787761694285ee336e829da Mon Sep 17 00:00:00 2001 From: naijun0403 Date: Mon, 16 Jun 2025 08:59:05 +0900 Subject: [PATCH] marble: add VINTF compatibility matrix files to BoardConfig.mk and remove from device.mk i'm sorry it's my mistake --- BoardConfig.mk | 8 ++++++++ device.mk | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 79be5ef..0f8b3c2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -193,6 +193,14 @@ BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3 +# VINTF +DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml + +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ + hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ + hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \ + vendor/lineage/config/device_framework_matrix.xml + # Use sha256 for dm-verity partitions BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256 BOARD_AVB_VENDOR_DLKM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256 diff --git a/device.mk b/device.mk index 979d0bb..6e4b819 100644 --- a/device.mk +++ b/device.mk @@ -141,14 +141,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ update_engine_client -# VINTF -DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml - -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ - hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ - hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \ - vendor/lineage/config/device_framework_matrix.xml - # WiFi Display PRODUCT_PACKAGES += \ libavservices_minijail \