From bb8c2fef56198f42ea267995cef3795359a4493b Mon Sep 17 00:00:00 2001
From: Ruchit Marathe <ruchitmarathe@gmail.com>
Date: Sat, 5 Nov 2022 21:52:04 +0530
Subject: [PATCH] sm7125-common: Include device FCM from vendor/aosp

---
 BoardConfigCommon.mk                       |  4 +-
 configs/framework_compatibility_matrix.xml | 47 ----------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fbf8d86..b441eea 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -158,7 +158,9 @@ TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x2000U | 0x400000000LL
 
 # HIDL manifests
 DEVICE_MANIFEST_FILE := $(COMMON_PATH)/configs/manifest.xml
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(COMMON_PATH)/configs/framework_compatibility_matrix.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
+    $(COMMON_PATH)/configs/framework_compatibility_matrix.xml \
+    vendor/aosp/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/configs/compatibility_matrix.xml
 
 # QCOM
diff --git a/configs/framework_compatibility_matrix.xml b/configs/framework_compatibility_matrix.xml
index bd66244..a7e7ac0 100644
--- a/configs/framework_compatibility_matrix.xml
+++ b/configs/framework_compatibility_matrix.xml
@@ -1,42 +1,3 @@
-<!--
-    Input:
-        vendor_framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        face_compatibility_matrix.xml
-        fingerprint_compatibility_matrix.xml
-        device_framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        vendor.samsung.hardware.hqm@1.0-matrix.xml
-        framework_compatibility_matrix.xml
-        vendor.samsung.hardware.tlc.iccc@1.0-matrix.xml
-        vendor.samsung.hardware.tlc.tima@1.0-matrix.xml
-        atn_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        vendor.samsung.hardware.tlc.hdm@1.1-matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        skeymaster_v4_framework_compatibility_matrix.xml
-        vendor.samsung.hardware.authfw@1.0-matrix.xml
-        tlc_payment_compatibility_matrix.xml
-        tlc_blockchain_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        radio_framework_compatibility_matrix_ds.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        framework_compatibility_matrix.xml
-        device_framework_compatibility_matrix.xml
-        device_framework_compatibility_matrix.xml
--->
 <compatibility-matrix version="2.0" type="framework">
     <hal format="hidl" optional="true">
         <name>android.hardware.automotive.evs</name>
@@ -153,14 +114,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.lineage.fastcharge</name>
-        <version>1.0</version>
-        <interface>
-            <name>IFastCharge</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.wifi.supplicant</name>
         <version>1.0-4</version>