NFC_NCIHALx_ARC0.4.7.0_M_OpnSrc
diff --git a/Android.mk b/Android.mk
index c9a295a..7435f7e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,11 +23,7 @@
 PN547C2 := 1
 PN548C2 := 2
 PN551   := 3
-
-NQ110 := $PN547C2
-NQ120 := $PN547C2
-NQ210 := $PN548C2
-NQ220 := $PN548C2
+PN553   := 4
 
 ifeq ($(PN547C2),1)
 D_CFLAGS += -DPN547C2=1
@@ -38,6 +34,9 @@
 ifeq ($(PN551),3)
 D_CFLAGS += -DPN551=3
 endif
+ifeq ($(PN553),4)
+D_CFLAGS += -DPN553=4
+endif
 
 #### Select the JCOP OS Version ####
 JCOP_VER_3_1 := 1
@@ -57,7 +56,7 @@
 endif
 
 #### Select the CHIP ####
-NXP_CHIP_TYPE := $(PN551)
+NXP_CHIP_TYPE := $(PN553)
 
 ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
 D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
@@ -65,11 +64,14 @@
 D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN548C2
 else ifeq ($(NXP_CHIP_TYPE),$(PN551))
 D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN551
+else ifeq ($(NXP_CHIP_TYPE),$(PN553))
+D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN553
 endif
 
 #Gemalto SE support
 D_CFLAGS += -DGEMALTO_SE_SUPPORT
 D_CFLAGS += -DNXP_UICC_ENABLE
+D_CFLAGS += -DJCOP_WA_ENABLE=FALSE
 
 #Routing Entries optimization
 D_CFLAGS += -DNFC_NXP_LISTEN_ROUTE_TBL_OPTIMIZATION=TRUE
@@ -77,6 +79,7 @@
 # Build shared library system/lib/libnfc-nci.so for stack code.
 
 LOCAL_ARM_MODE := arm
+###LOCAL_MULTILIB := 64
 LOCAL_MODULE := libnfc-nci
 LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware
 LOCAL_CFLAGS += $(D_CFLAGS)