diff options
| author | Martijn Coenen <maco@google.com> | 2015-11-03 13:50:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-03 13:50:34 +0000 |
| commit | 761cf10d8ad8aaa793d5d88de8e7f70de8bffbfa (patch) | |
| tree | 36466fe037a429ca96c0e61e72abb6bbc455b0dc | |
| parent | 12807b8e5a1bb435eae58489ec2bdc7ff58ad6f5 (diff) | |
| parent | f644e0182e68dd9488594e729408a71dad330f72 (diff) | |
| download | libnfc-nci-761cf10d8ad8aaa793d5d88de8e7f70de8bffbfa.tar.gz | |
Merge "add PN54x chip selection" am: 8c3bbf44cb
am: f644e0182e
* commit 'f644e0182e68dd9488594e729408a71dad330f72':
add PN54x chip selection
| -rw-r--r-- | halimpl/pn54x/Android.mk | 4 |
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 |