From 310cdffbc9b0f91e66b9620f07a1e1a20606efbb Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <akoskovich@pm.me>
Date: Thu, 9 Jun 2022 02:57:16 -0700
Subject: [PATCH] sm8250-common: Switch to AOSP NXP NFC HAL

Test: Verified NFC turns on, can read tags, and went
      to a Dunkin Donuts and used Google Pay.

Change-Id: I8cd8815ab883d83a5c07c8f01a9bdeff594c470b
---
 common.mk                   | 6 +-----
 device_framework_matrix.xml | 8 ++++++++
 extract-files.sh            | 2 +-
 manifest.xml                | 4 ++--
 proprietary-files.txt       | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common.mk b/common.mk
index f617f1c..670bdf4 100644
--- a/common.mk
+++ b/common.mk
@@ -272,15 +272,11 @@ PRODUCT_PACKAGES += \
     android.hardware.neuralnetworks@1.3.vendor
 
 # NFC
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/nxp/opensource/sn100x
-
 PRODUCT_PACKAGES += \
+    android.hardware.nfc_snxxx@1.2-service \
     android.hardware.secure_element@1.2.vendor \
     com.android.nfc_extras \
     NfcNci \
-    nqnfcinfo \
-    vendor.nxp.hardware.nfc@2.0-service \
     Tag
 
 PRODUCT_COPY_FILES += \
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index 0f56e34..2577242 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -15,6 +15,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.nxp.nxpnfc</name>
+        <version>2.0</version>
+        <interface>
+            <name>INxpNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.oneplus.faceunlock.hal</name>
         <version>1.0</version>
diff --git a/extract-files.sh b/extract-files.sh
index 11f4126..f94e448 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -72,7 +72,7 @@ function blob_fixup() {
         system_ext/lib64/libwfdnative.so)
             sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}"
             ;;
-        vendor/etc/libnfc-mtp-SN100.conf)
+        vendor/etc/libnfc-nxp.conf)
             sed -i "s/^NXP_RF_CONF_BLK_9/#NXP_RF_CONF_BLK_9/" "${2}"
             sed -i "s/^NXP_RF_CONF_BLK_10/#NXP_RF_CONF_BLK_10/" "${2}"
             ;;
diff --git a/manifest.xml b/manifest.xml
index 314beb1..699f0cf 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -182,11 +182,11 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>vendor.nxp.hardware.nfc</name>
+        <name>vendor.nxp.nxpnfc</name>
         <transport>hwbinder</transport>
         <version>2.0</version>
         <interface>
-            <name>INqNfc</name>
+            <name>INxpNfc</name>
             <instance>default</instance>
         </interface>
     </hal>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0ba7d17..c759008 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -859,7 +859,7 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
-odm/etc/nfc/libnfc-mtp-SN100.conf_19805:vendor/etc/libnfc-mtp-SN100.conf
+odm/etc/nfc/libnfc-mtp-SN100.conf_19805:vendor/etc/libnfc-nxp.conf
 odm/etc/nfc/libnfc-nci.conf_19805:vendor/etc/libnfc-nci.conf
 odm/lib/libsn100u_fw.so:vendor/lib/libsn100u_fw.so