From a639e6b415e18d088e4dbb3bdb88cefafcedab7d Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 24 Sep 2019 17:05:28 +0100 Subject: [PATCH] polaris: Bring NFC NXP up to speed The soong namespaces must now be set so that the proper implementations are selected. Change-Id: Ic205daf36a1153d94e7d03a7693fb2583703e2b5 --- device.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 22e83ec..1007ac4 100644 --- a/device.mk +++ b/device.mk @@ -20,8 +20,9 @@ DEVICE_PACKAGE_OVERLAYS += \ # Permissions PRODUCT_COPY_FILES += \ - 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.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.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.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml \ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \ @@ -70,12 +71,13 @@ PRODUCT_PACKAGES += \ com.android.nfc_extras \ com.gsma.services.nfc \ com.nxp.nfc.nq \ - nfc_nci.nqx.default \ + libnqnfc_nci_jni \ + nfc_nci.nqx.default.hw \ NQNfcNci \ nqnfcee_access.xml \ nqnfcse_access.xml \ Tag \ - vendor.nxp.hardware.nfc@1.1-service + vendor.nxp.hardware.nfc@1.2-service PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \ @@ -84,3 +86,7 @@ PRODUCT_COPY_FILES += \ # Secure element PRODUCT_PACKAGES += \ SecureElement + +# Soong namespaces +PRODUCT_SOONG_NAMESPACES += \ + vendor/nxp/opensource/pn5xx