From 20fae248271b74256c5983137ce70cb968b92d0c Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Tue, 31 Dec 2024 12:50:19 +0100
Subject: [PATCH] e3q: Build NXP NFC HAL

Change-Id: I60fa53c887117a8f7d8f8b77d660329709d5b18d
---
 configs/vintf/manifest_pineapple.xml |  8 ++++----
 device.mk                            | 17 +++++++++++++++++
 proprietary-files.txt                |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/configs/vintf/manifest_pineapple.xml b/configs/vintf/manifest_pineapple.xml
index 72eb6ec..a7cca14 100644
--- a/configs/vintf/manifest_pineapple.xml
+++ b/configs/vintf/manifest_pineapple.xml
@@ -79,16 +79,16 @@ SPDX-License-Identifier: BSD-3-Clause-Clear
         </interface>
     </hal>
     <!-- NFC HAL service -->
-    <hal format="aidl">
+    <!--hal format="aidl">
         <name>android.hardware.nfc</name>
         <version>1</version>
         <fqname>INfc/default</fqname>
-    </hal>
-    <hal format="aidl">
+    </hal-->
+    <!--hal format="aidl">
         <name>vendor.nxp.nxpnfc_aidl</name>
         <version>1</version>
         <fqname>INxpNfc/default</fqname>
-    </hal>
+    </hal-->
     <hal format="aidl">
         <name>android.hardware.secure_element</name>
         <version>1</version>
diff --git a/device.mk b/device.mk
index 85808c7..d6047a8 100644
--- a/device.mk
+++ b/device.mk
@@ -164,6 +164,23 @@ PRODUCT_COPY_FILES += \
     $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.base-arm64.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.base-arm64.policy \
     $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.ext-arm64.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.ext-arm64.policy
 
+# NFC
+PRODUCT_PACKAGES += \
+    android.hardware.nfc-service.nxp \
+    nqnfcinfo \
+    Tag
+
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
+    frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
+    frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
+    frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
+    frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
+    frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
+    frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
+    frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
+    frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1128c2d..4987809 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -424,7 +424,6 @@ vendor/firmware/kiwi/regdb.bin
 vendor/firmware/max77775-extra-fw.bin
 vendor/firmware/max77775-fw.bin
 vendor/firmware/mfc/mfc_fw_flash_nu1668.bin
-vendor/firmware/nfc/libsn300u_fw.so
 vendor/firmware/ois_mcu_stm32g_fw.bin
 vendor/firmware/ois_rumba_fw.bin
 vendor/firmware/ss_dsi_panel_PBA_BOOTING_FHD.dat
@@ -666,6 +665,7 @@ vendor/lib64/libvmmem.so
 # NFC
 vendor/etc/libnfc-nxp.conf
 vendor/etc/nfc/libnfc-nxp_RF.conf
+vendor/firmware/nfc/libsn300u_fw.so
 
 # NVM
 vendor/bin/sec_nvm