zenfone6: Add NQ NFC
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b6d922d..b07319a 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -115,6 +115,9 @@
TARGET_KERNEL_CLANG_COMPILE := true
TARGET_KERNEL_CLANG_VERSION := 6.0.2
+# NFC
+TARGET_USES_NQ_NFC := true
+
# Partitions
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
diff --git a/device.mk b/device.mk
index 557050b..c0b7135 100755
--- a/device.mk
+++ b/device.mk
@@ -115,6 +115,15 @@
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/media_profiles_vendor.xml:system/etc/media_profiles_vendor.xml
+# NFC - NQ (NXP)
+PRODUCT_PACKAGES += \
+ Tag \
+ com.android.nfc_extras
+
+PRODUCT_PACKAGES += \
+ android.hardware.nfc@1.1 \
+ android.hardware.nfc@1.0
+
# Prebuilt
PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/system,system) \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 64d6f2d..99d7381 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -85,6 +85,20 @@
lib64/librcc.so
lib64/vendor.qti.imsrtpservice@1.0.so
+# NFC
+-app/NQNfcNci/NQNfcNci.apk
+-framework/com.nxp.nfc.nq.jar
+-framework/com.gsma.services.nfc.jar
+etc/permissions/com.nxp.nfc.nq.xml
+etc/permissions/com.gsma.services.nfc.xml
+etc/nqnfcee_access.xml
+etc/nqnfcse_access.xml
+lib/vendor.nxp.hardware.nfc@1.0.so
+lib64/vendor.nxp.hardware.nfc@1.0.so
+lib/libnqnfc-nci.so
+lib64/libnqnfc-nci.so
+lib64/libnqnfc_nci_jni.so
+
# Telephony
-app/QtiTelephonyService/QtiTelephonyService.apk
etc/permissions/qcrilhook.xml
diff --git a/system.prop b/system.prop
index e7ca90e..fed47bb 100644
--- a/system.prop
+++ b/system.prop
@@ -5,4 +5,7 @@
persist.vendor.dpm.feature=10
# Media
-media.settings.xml=/system/etc/media_profiles_vendor.xml
\ No newline at end of file
+media.settings.xml=/system/etc/media_profiles_vendor.xml
+
+# system prop for NFC DT
+ro.nfc.port=I2C
\ No newline at end of file