From eeb91793cd34ff384edb5b0cbb20ae60c7b974c6 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 31 May 2025 13:01:12 +0100 Subject: [PATCH] dre: Move and recategorize compat matrix and manifest flags Qualcomm also sets these in (common) product makefiles. Change-Id: I7139cba92454106fbca5f6105b966a43e70fe9d6 --- BoardConfig.mk | 7 ------- device.mk | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 8486784..97d3244 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -71,13 +71,6 @@ TARGET_SCREEN_DENSITY := 450 # Filesystem TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs -# HIDL -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \ - hardware/oplus/vintf/device_framework_matrix.xml \ - hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml -DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml -DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml - # Kernel BOARD_BOOT_HEADER_VERSION := 3 BOARD_KERNEL_BASE := 0x00000000 diff --git a/device.mk b/device.mk index 272de11..837ee7c 100644 --- a/device.mk +++ b/device.mk @@ -381,6 +381,13 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml +# VINTF +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \ + hardware/oplus/vintf/device_framework_matrix.xml \ + hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml +DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml +DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml + # WiFi PRODUCT_PACKAGES += \ android.hardware.wifi-service \