From 04b45dcda0433d0d4b6fad8bcf38b4b4890a86ea Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Sun, 22 Dec 2024 00:11:44 -0700
Subject: [PATCH] sm7325-common: Guard android.hardware.nfc HIDL entry

tundra uses snxxx NFC AIDL HAL which doesn't use android.hardware.nfc,
so let's guard it so we don't have to decommonize it for just one device

Change-Id: Ic8d78a401c614ea4b19c7fccdc7f472bc67534d6
---
 BoardConfigCommon.mk |  3 +++
 manifest.xml         |  9 ---------
 manifest_nfc.xml     | 11 +++++++++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 manifest_nfc.xml

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 10d7dd5..2726809 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -116,6 +116,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
+ifeq ($(TARGET_HAS_SNXXX_NFC),)
+DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_nfc.xml
+endif
 
 # Metadata
 BOARD_USES_METADATA_PARTITION := true
diff --git a/manifest.xml b/manifest.xml
index d0d385f..9c97c49 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -68,15 +68,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>INfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
diff --git a/manifest_nfc.xml b/manifest_nfc.xml
new file mode 100644
index 0000000..e7a9ddc
--- /dev/null
+++ b/manifest_nfc.xml
@@ -0,0 +1,11 @@
+<manifest version="2.0" type="device" target-level="5">
+    <hal format="hidl">
+        <name>android.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>