diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-12-27 12:53:20 -0800 |
| commit | dd55580a6f3d72175f0cb78c9fc4fac59cf9be09 (patch) | |
| tree | 39bb820cbe6d2a093abb72cc837c52c95039c9c7 /Android.mk | |
| parent | 5199e59069db67d4f3bb2a466adab2e4647e8e70 (diff) | |
| parent | 68c93f6f41998fbff40a3396a633faee4d595695 (diff) | |
| download | external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.zip external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.gz external_libnfc-nxp-dd55580a6f3d72175f0cb78c9fc4fac59cf9be09.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
Conflicts:
src/phHal4Nfc_ADD.c
Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
Diffstat (limited to 'Android.mk')
| -rwxr-xr-x | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -107,6 +107,11 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DNFC_TIMER_CONTEXT -fno-strict-aliasing +ifeq ($(TARGET_HAS_NFC_CUSTOM_CONFIG),true) +LOCAL_CFLAGS += -DNFC_CUSTOM_CONFIG_INCLUDE +LOCAL_CFLAGS += -I$(TARGET_OUT_HEADERS)/libnfc-nxp +endif + # Uncomment for Chipset command/responses # Or use "setprop debug.nfc.LOW_LEVEL_TRACES" at run-time # LOCAL_CFLAGS += -DLOW_LEVEL_TRACES |