begonia: Switch to NQ NFC stack

* So that it matches prebuilt vendor. On a sidenote, this was moved from the common tree to the individual device trees, because not all the targets support NFC. Change-Id: Ic600594bc073ef3883225fb01039b1953a880807 Signed-off-by: theimpulson <aayushgupta219@gmail.com>
theimpulson · Apr 12, 2020 · 30e22dc · 30e22dc
1 parent 074d0a8
commit 30e22dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -99,6 +99,9 @@ DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
 # Network Routing
 TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE := true
 
+# NFC
+TARGET_USES_NQ_NFC := true
+
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864

diff --git a/device.mk b/device.mk
@@ -61,9 +61,15 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    NfcNci \
-    Tag \
-    com.android.nfc_extras
+    com.android.nfc_extras \
+    com.gsma.services.nfc \
+    com.nxp.nfc.nq \
+    libnqnfc_nci_jni \
+    nqnfcee_access.xml \
+    nqnfcse_access.xml \
+    NQNfcNci \
+    SecureElement \
+    Tag
 
 # Trust
 PRODUCT_PACKAGES += \