commit 3f9537a867b90b76ab580bae28a224f9712cdc7d
author Puneet Mishra <puneetm@codeaurora.org> Mon Nov 23 16:57:02 2015 +0000
committer Puneet Mishra <puneetm@codeaurora.org> Wed Nov 25 17:44:24 2015 +0000
tree d818c9deffbe10ee05db966603ed4dbeade52b1f
parent a25b5108001908d0a563da5930898c7cd41b7157

NFC: Enable use of libp61-jcop-kit

Enable p61-jcop-kit in makefiles, mark as non-AOSP.

Change-Id: Id9b675e5fa0f6505956ce9f62fa4b515566f9407

Android.mk

diff --git a/Android.mk b/Android.mk
index f9608cd..c281492 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,7 +49,7 @@
 LOCAL_CFLAGS += -DJCOP_VER_3_1_2=$(JCOP_VER_3_1_2)
 LOCAL_CFLAGS += -DJCOP_VER_3_2=$(JCOP_VER_3_2)
 
-NFC_NXP_ESE:= FALSE
+NFC_NXP_ESE:= TRUE
 ifeq ($(NFC_NXP_ESE),TRUE)
 LOCAL_CFLAGS += -DNFC_NXP_ESE=TRUE
 LOCAL_CFLAGS += -DNFC_NXP_ESE_VER=$(JCOP_VER_3_1_2)
@@ -63,7 +63,7 @@
 #Gemalto SE support
 D_CFLAGS += -DGEMALTO_SE_SUPPORT
 D_CFLAGS += -DNXP_UICC_ENABLE
-D_CFLAGS += -DNFC_POWER_MANAGEMENT=FALSE
+D_CFLAGS += -DNFC_POWER_MANAGEMENT=TRUE
 ######################################
 # Build shared library system/lib/libnfc-nci.so for stack code.
 

halimpl/pn54x/Android.mk

diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index 5e44761..793cd58 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -72,7 +72,7 @@
 LOCAL_CFLAGS += -DANDROID \
         -DNXP_UICC_ENABLE -DNXP_HW_SELF_TEST
 LOCAL_CFLAGS += -DNFC_NXP_HFO_SETTINGS=FALSE
-D_CFLAGS += -DNFC_POWER_MANAGEMENT=FALSE
+D_CFLAGS += -DNFC_POWER_MANAGEMENT=TRUE
 LOCAL_CFLAGS += $(D_CFLAGS)
 #LOCAL_CFLAGS += -DFELICA_CLT_ENABLE
 #-DNXP_PN547C1_DOWNLOAD

p61-jcop-kit/Android.mk

diff --git a/p61-jcop-kit/Android.mk b/p61-jcop-kit/Android.mk
index 989f207..68067ac 100644
--- a/p61-jcop-kit/Android.mk
+++ b/p61-jcop-kit/Android.mk
@@ -10,13 +10,15 @@
 LOCAL_PATH:= $(call my-dir)
 D_CFLAGS += -DNXP_LDR_SVC_VER_2=TRUE
 ######################################
-# Build shared library system/lib/libp61-jcop-kit.so for stack code.
+# Build shared library system/vendor/lib/libp61-jcop-kit.so for stack code.
 
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libp61-jcop-kit
 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 := \
@@ -27,7 +29,3 @@
     $(call all-cpp-files-under, src)
 
 include $(BUILD_SHARED_LIBRARY)
-
-
-######################################
-include $(call all-makefiles-under,$(LOCAL_PATH))