summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDaniel Tomas <dtomas.nxp@gmail.com>2011-06-02 18:53:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 18:53:29 -0700
commit6acedcddce994bc83b6e2db306988eeec10f1008 (patch)
tree7403b0d529f398359f5003304f69ff4ec587deb0 /Android.mk
parent43779d274e8a5b042f6c1d01e97e2138f0df0b14 (diff)
parent5d96b2d2dd4ba566dcb0fd5e1b5f0e84e458c4af (diff)
downloadexternal_libnfc-nxp-6acedcddce994bc83b6e2db306988eeec10f1008.zip
external_libnfc-nxp-6acedcddce994bc83b6e2db306988eeec10f1008.tar.gz
external_libnfc-nxp-6acedcddce994bc83b6e2db306988eeec10f1008.tar.bz2
am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'
* commit '5d96b2d2dd4ba566dcb0fd5e1b5f0e84e458c4af': Properly merge 'Patch to enable low level traces.'
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index a83d35c..970a5c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -106,18 +106,16 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_i2c.c
LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c
# Really verbose:
-#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DDEBUG -DDAL_TRACE -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common -fpic
+#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DDEBUG -DDAL_TRACE -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -fpic
+# Just show I2C traffic:
+#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DINCLUDE_DALINIT_DEINIT -DLOW_LEVEL_TRACES -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -fpic
+# Quiet:
LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -fpic
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common
endif
-# Just show I2C traffic:
-#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DINCLUDE_DALINIT_DEINIT -DLOW_LEVEL_TRACES -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common -fpic
-# Quiet:
-#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DINCLUDE_DALINIT_DEINIT -pipe -fomit-frame-pointer -Wall -Wno-trigraphs -Werror-implicit-function-declaration -fno-strict-aliasing -mapcs -mno-sched-prolog -mabi=aapcs-linux -mno-thumb-interwork -msoft-float -Uarm -fno-common -fpic
-
ifeq ($(NFC_BUILD_VARIANT),debug)
LOCAL_CFLAGS += -DDEBUG -D_DEBUG
LOCAL_CFLAGS += -O0 -g