NFC: Merge branch 'nfc.lnx.2.9' into nfc.lnx.3.1
* nfc.lnx.2.9: (90 commits)
NFC: Add chiptype info for NQ2xx chipsets
NFC: Fix SWP set/get configuration for NQ2xx
NFC: Fix compile error
NFC: Integrate constants, hal modifications and feature list
SEAccessKit_AR8.1.0_OpnSrc
NFC_NCIHALx_AR00C0.8.1.0_O_OpnSrc
MW version updated to 8.1.0
[LxDebug]:Added config NXP_NCI_PARSER_LIBRARY to enable/disable parser library
MW-version-updated-to-8.0.18
NFC init is not proper after FW update
[EMPTY_AID] : Replace ISO7816 proto routing to EMPTY AID routing
NFC_GetConfig and NFC_PowerLink command are sent back to back causing JNI to be never notified thus causing NFC service died issue
NFC service died while semdaemon and NFC Off/On
MW version updated to 8.0.17
MW version updated to 8.0.16
MW version updated to 8.0.15
Continous presence check even I93 tag is removed added fix for handling corrupted RF frames
eSE restricted mode check failure storage bin file dependancy is removed
Remove APDU and connectivity pipe dependency on bin file
[SEMDAEMON-NFCOFF/ON] GKI leak observed during NFC ON/OFF and SemDaemon. 1. Set NFC service PID function added in NFC_API 2. Setting NFC PID after NFC service
...
Change-Id: Iadf2725720d7e61eae25368197b086d6549be915
diff --git a/p61-jcop-kit/Android.mk b/p61-jcop-kit/Android.mk
index 0800002..a2a328d 100644
--- a/p61-jcop-kit/Android.mk
+++ b/p61-jcop-kit/Android.mk
@@ -15,7 +15,7 @@
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libp61-jcop-kit
+LOCAL_MODULE := libnqp61-jcop-kit
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := nxp
LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware