commit 5aa7aa12fcf0fcb382a1ff0493552a3fb79ececc
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Aug 10 18:26:34 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 10 18:26:34 2017 -0700
tree 84e7bb0f7abc27958011604cc8401b39f68e2799
parent f10236b2ea6cc65a51eb3ce7f9fdedfaeedc18f7
parent 98323630ab0e5d369db0aaa8d334d0e71782a94c

Merge "NFC: Added flag for DUAL_UICC mismatch"

Android.mk

diff --git a/Android.mk b/Android.mk
index e0cdb8f..247282d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,6 +60,12 @@
 LOCAL_CFLAGS += -DNFC_NXP_ESE=FALSE
 endif
 
+ifeq ($(call is-board-platform-in-list,msm8909w msm8916 msm8994 msm8909 msm8996 msm8992 msm8952 msm8937 msm8953 msm8998),true)
+D_CFLAGS += -DNQ_NFC_DUAL_UICC=FALSE
+else
+D_CFLAGS += -DNQ_NFC_DUAL_UICC=TRUE
+endif
+
 #### Select the CHIP ####
 ifeq ($(strip $(NQ3XX_PRESENT)),true)
 NXP_CHIP_TYPE := $(PN557)