commit 761cf10d8ad8aaa793d5d88de8e7f70de8bffbfa
author Martijn Coenen <maco@google.com> Tue Nov 03 13:50:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 03 13:50:34 2015 +0000
tree 36466fe037a429ca96c0e61e72abb6bbc455b0dc
parent 12807b8e5a1bb435eae58489ec2bdc7ff58ad6f5
parent f644e0182e68dd9488594e729408a71dad330f72

Merge "add PN54x chip selection" am: 8c3bbf44cb
am: f644e0182e

* commit 'f644e0182e68dd9488594e729408a71dad330f72':
  add PN54x chip selection

halimpl/pn54x/Android.mk

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 @@
 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