From 096bffe79f886aeb3079169ea241b08026c01fc2 Mon Sep 17 00:00:00 2001
From: AnierinB <anierin@evolution-x.org>
Date: Tue, 12 Aug 2025 13:25:58 -0700
Subject: [PATCH] milanf: Switch to AIDL NXP NFC HAL

Change-Id: I924ec1285904a1a2fe69c167eaf07148fda5bc1e
Signed-off-by: AnierinB <anierin@evolution-x.org>
---
 device.mk           | 2 +-
 extract-files.py    | 3 ---
 sku/manifest_dn.xml | 5 -----
 sku/manifest_n.xml  | 5 -----
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/device.mk b/device.mk
index fc3612a..db69e3f 100644
--- a/device.mk
+++ b/device.mk
@@ -54,7 +54,7 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.2-service.samsung \
+    android.hardware.nfc-service.nxp \
     com.android.nfc_extras \
     Tag
 
diff --git a/extract-files.py b/extract-files.py
index f128fc5..4d64360 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -31,9 +31,6 @@ lib_fixups: lib_fixups_user_type = {
 }
 
 blob_fixups: blob_fixups_user_type = {
-    'vendor/etc/init/android.hardware.nfc@1.2-service.sec.rc': blob_fixup()
-        .regex_replace('sec', 'samsung')
-        .regex_replace('class hal\n    user nfc', 'override\n    class hal\n    user nfc'),
     'vendor/lib64/libBSTSWAD.so': blob_fixup()
         .clear_symbol_version('AHardwareBuffer_allocate')
         .clear_symbol_version('AHardwareBuffer_describe')
diff --git a/sku/manifest_dn.xml b/sku/manifest_dn.xml
index bc05a87..7f5942a 100644
--- a/sku/manifest_dn.xml
+++ b/sku/manifest_dn.xml
@@ -3,11 +3,6 @@
         manifest_dn.xml
 -->
 <manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::INfc/default</fqname>
-    </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.secure_element</name>
         <transport>hwbinder</transport>
diff --git a/sku/manifest_n.xml b/sku/manifest_n.xml
index 954cc85..7d15007 100644
--- a/sku/manifest_n.xml
+++ b/sku/manifest_n.xml
@@ -3,11 +3,6 @@
         manifest_n.xml
 -->
 <manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::INfc/default</fqname>
-    </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>