NFC: Modify third party libnfc-nci
The third party libnfc-nci has to coexist with the AOSP baseline.
Furthermore, it has to be compatible with the NQx chip family.
Modified makefiles and config files to reflect NQx naming scheme.
Modified HAL to avoid modifications to libhardware for new ioctl
function pointer.
Change-Id: I9c9c7e8679c71edfa0c29d2cdcc10041915b9d6e
diff --git a/Android.mk b/Android.mk
index aa04ff6..f9608cd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,4 @@
+ifeq ($(strip $(TARGET_USES_NQ_NFC)),true)
# function to find all *.cpp files under a directory
define all-cpp-files-under
$(patsubst ./%,%, \
@@ -67,8 +68,10 @@
# Build shared library system/lib/libnfc-nci.so for stack code.
LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libnfc-nci
+LOCAL_MODULE := libnqnfc-nci
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_OWNER := nxp
LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware
LOCAL_CFLAGS += $(D_CFLAGS)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/include \
@@ -94,3 +97,4 @@
######################################
include $(call all-makefiles-under,$(LOCAL_PATH))
+endif