summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-11-03 13:24:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-03 13:24:44 +0000
commit8c3bbf44cbb767b12d79e7402dc8178bd5db07c7 (patch)
tree7b9e9dbe4a16be9e516756e5626ebcb6f69bcbae
parentce926cf46d2c8c689df3bbac24edf41f05daee71 (diff)
parent007bb5e32a61da926710a3d0b32a172b6c36302b (diff)
downloadlibnfc-nci-8c3bbf44cbb767b12d79e7402dc8178bd5db07c7.tar.gz
Merge "add PN54x chip selection"
-rw-r--r--halimpl/pn54x/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index d75a654..4b8bc2a 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -41,7 +41,11 @@ LOCAL_CFLAGS += -DPN548C2=2
endif
#### Select the CHIP ####
+ifeq ($(NFC_NXP_CHIP_TYPE),PN547C2)
+LOCAL_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
+else
LOCAL_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN548C2
+endif
LOCAL_CFLAGS += -DANDROID \
-DNXP_UICC_ENABLE -DNXP_HW_SELF_TEST