sm7250-common: Switch back to AOSP NFC

common.mk

@@ -347,15 +347,14 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.0:64 \
+    android.hardware.nfc@1.2 \
-    android.hardware.nfc@1.1:64 \
+    android.hardware.nfc@1.2-service \
-    android.hardware.nfc@1.2:64 \
-    android.hardware.secure_element@1.0:64 \
     com.android.nfc_extras \
+    com.gsma.services.nfc \
+    QuickAccessWallet \
+    NfcNci \
     SecureElement \
-    Tag \
+    Tag
-    vendor.nxp.nxpese@1.0:64 \
-    vendor.nxp.nxpnfc@1.0:64
 
 # OMX
 PRODUCT_PACKAGES += \

proprietary-files.txt

@@ -474,12 +474,6 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
--system_ext/app/NxpNfcNci/NxpNfcNci.apk;OVERRIDES=NfcNci
-system/etc/nfcee_access.xml
-system_ext/etc/permissions/com.nxp.nfc.xml
-system_ext/framework/com.nxp.nfc.jar
-system_ext/lib64/libnxpnfc-nci.so
-system_ext/lib64/libnxpnfc_nci_jni.so
 vendor/bin/hw/android.hardware.nfc@1.2-service
 vendor/etc/init/android.hardware.nfc@1.2-service.rc
 vendor/lib64/hw/android.hardware.nfc@1.0-impl.so