summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2015-11-03 13:45:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-03 13:45:00 +0000
commitf644e0182e68dd9488594e729408a71dad330f72 (patch)
tree36466fe037a429ca96c0e61e72abb6bbc455b0dc
parentdacb0c215d2423f460ca9e8e716ca3c7328192e0 (diff)
parent8c3bbf44cbb767b12d79e7402dc8178bd5db07c7 (diff)
downloadlibnfc-nci-f644e0182e68dd9488594e729408a71dad330f72.tar.gz
Merge "add PN54x chip selection"
am: 8c3bbf44cb * commit '8c3bbf44cbb767b12d79e7402dc8178bd5db07c7': 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