NFC_NCIHALx_ARFC.7.1.0_N_OpnSrc
diff --git a/Android.mk b/Android.mk
index d7c0972..28c22be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,6 @@
#Enable NXP Specific
D_CFLAGS += -DNXP_EXTNS=TRUE
-D_CFLAGS += -DNFC_NXP_STAT_DUAL_UICC_EXT_SWITCH=TRUE
D_CFLAGS += -DNFC_NXP_AID_MAX_SIZE_DYN=TRUE
#Enable HCE-F specific
@@ -42,15 +41,17 @@
JCOP_VER_3_1 := 1
JCOP_VER_3_2 := 2
JCOP_VER_3_3 := 3
+JCOP_VER_4_0 := 4
LOCAL_CFLAGS += -DJCOP_VER_3_1=$(JCOP_VER_3_1)
LOCAL_CFLAGS += -DJCOP_VER_3_2=$(JCOP_VER_3_2)
LOCAL_CFLAGS += -DJCOP_VER_3_3=$(JCOP_VER_3_3)
+LOCAL_CFLAGS += -DJCOP_VER_4_0=$(JCOP_VER_4_0)
NFC_NXP_ESE:= TRUE
ifeq ($(NFC_NXP_ESE),TRUE)
LOCAL_CFLAGS += -DNFC_NXP_ESE=TRUE
-LOCAL_CFLAGS += -DNFC_NXP_ESE_VER=$(JCOP_VER_3_3)
+LOCAL_CFLAGS += -DNFC_NXP_ESE_VER=$(JCOP_VER_4_0)
else
LOCAL_CFLAGS += -DNFC_NXP_ESE=FALSE
endif
@@ -68,10 +69,11 @@
D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN553
endif
-#Gemalto SE support
-D_CFLAGS += -DGEMALTO_SE_SUPPORT
-D_CFLAGS += -DNXP_UICC_ENABLE
+ifeq ($(NXP_CHIP_TYPE),$(PN553))
D_CFLAGS += -DJCOP_WA_ENABLE=FALSE
+else
+D_CFLAGS += -DJCOP_WA_ENABLE=TRUE
+endif
#Routing Entries optimization
D_CFLAGS += -DNFC_NXP_LISTEN_ROUTE_TBL_OPTIMIZATION=TRUE
@@ -79,7 +81,11 @@
# Build shared library system/lib/libnfc-nci.so for stack code.
LOCAL_ARM_MODE := arm
-###LOCAL_MULTILIB := 64
+ifeq (true,$(TARGET_IS_64_BIT))
+LOCAL_MULTILIB := 64
+else
+LOCAL_MULTILIB := 32
+endif
LOCAL_MODULE := libnfc-nci
LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware
LOCAL_CFLAGS += $(D_CFLAGS)