From 67405e1c5a7ade957f3158df557865f0f788bce3 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 8 Feb 2024 17:05:32 +0000
Subject: [PATCH] sm7125-common: Use the common device compatibility matrix
 from QCOM

Change-Id: I0c0f3ecddbe6d7b232cc0d13c78ca58094e4e720
---
 BoardConfigCommon.mk             |  2 +-
 configs/compatibility_matrix.xml | 88 --------------------------------
 2 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 configs/compatibility_matrix.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 63dcdd1..e8018d2 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -162,7 +162,7 @@ TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x2000U | 0x400000000LL
 
 # HIDL manifests
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/configs/manifest.xml
-DEVICE_MATRIX_FILE := $(COMMON_PATH)/configs/compatibility_matrix.xml
+DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(COMMON_PATH)/configs/framework_compatibility_matrix.xml \
     vendor/lineage/config/device_framework_matrix.xml
diff --git a/configs/compatibility_matrix.xml b/configs/compatibility_matrix.xml
deleted file mode 100644
index 0e45b94..0000000
--- a/configs/compatibility_matrix.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
-    Input:
-        compatibility_matrix.xml
-        device_compatibility_matrix.xml
-        device_compatibility_matrix.xml
-        vendor.samsung.frameworks.codecsolution-matrix.xml
--->
-<compatibility-matrix version="2.0" type="device">
-    <hal format="hidl" optional="false">
-        <name>android.frameworks.schedulerservice</name>
-        <version>1.0</version>
-        <interface>
-            <name>ISchedulingPolicyService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.frameworks.sensorservice</name>
-        <version>1.0</version>
-        <interface>
-            <name>ISensorManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hidl.allocator</name>
-        <version>1.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>ashmem</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hidl.manager</name>
-        <version>1.0</version>
-        <interface>
-            <name>IServiceManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hidl.memory</name>
-        <version>1.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>ashmem</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.hidl.token</name>
-        <version>1.0</version>
-        <interface>
-            <name>ITokenManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="false">
-        <name>android.system.wifi.keystore</name>
-        <version>1.0</version>
-        <interface>
-            <name>IKeystore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.qccsyshal</name>
-        <version>1.0</version>
-        <interface>
-            <name>IQccsyshal</name>
-            <instance>qccsyshal</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.sigma_miracast</name>
-        <version>1.0</version>
-        <interface>
-            <name>Isigma_miracast</name>
-            <instance>sigmahal</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.samsung.frameworks.codecsolution</name>
-        <interface>
-            <name>ISehCodecSolution</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</compatibility-matrix>