davinci: Switch to AOSP NFC stack

Change-Id: I537729ac9262edd3b741380bba74e46e8a588eaf

BoardConfig.mk

@@ -130,9 +130,6 @@ BOARD_MKBOOTIMG_ARGS := --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
 TARGET_USES_ION := true
 TARGET_DISABLED_UBWC := true
 
-# NFC
-TARGET_USES_NQ_NFC := true
-
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 134217728
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456

configs/hidl/manifest-nfc.xml

@@ -9,14 +9,4 @@
         </interface>
         <fqname>@1.2::INfc/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>INqNfc</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::INqNfc/default</fqname>
-    </hal>
 </manifest>

device.mk

@@ -262,18 +262,14 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml
 
 # NFC
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/nxp/opensource/sn100x
-
 PRODUCT_PACKAGES += \
     com.android.nfc_extras \
-    com.nxp.nfc.nq \
-    NQNfcNci \
+    NfcNci \
+    SecureElement \
     Tag
 
 PRODUCT_PACKAGES += \
-    nfc_nci.nqx.default.hw \
-    vendor.nxp.hardware.nfc@2.0-service
+    android.hardware.nfc@1.2-service
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf \

rootdir/etc/init.target.rc

@@ -54,7 +54,7 @@ on init && property:ro.boot.hwc=CN
     setprop ro.boot.product.hardware.sku davinci
 
 on property:ro.boot.product.hardware.sku=davinci
-    enable nqnfc_2_0_hal_service
+    enable vendor.nfc_hal_service
 
 on fs
     mount_all --early
@@ -219,7 +219,7 @@ service vendor.motor /vendor/bin/hw/vendor.xiaomi.hardware.motor@1.0-service
     group system
     writepid /dev/cpuset/system-background/tasks
 
-service nqnfc_2_0_hal_service /vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service
+service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service
     override
     class hal
     user nfc