diff options
| author | Nick Pelly <npelly@google.com> | 2011-06-27 09:01:51 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-06-27 09:30:36 -0700 |
| commit | 34ff48f6cd6595a899e05fbd56f4c84891840d3f (patch) | |
| tree | 2157358fa3ddd5309f102185c8cf278fbb078d2c /Android.mk | |
| parent | d4cb91ee6f74f187cc0e7ba9dc073b0a77c27dfa (diff) | |
| download | external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.zip external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.gz external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.bz2 | |
libnfc spring cleaning
o Fix most libnfc warnings, from 360 to 18
o Make DAL_DEBUG much less verbose and more useful
o Clean up Android.mk
Done with minimal textual diff to minimize merge conflicts.
Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 37 |
1 files changed, 11 insertions, 26 deletions
@@ -6,7 +6,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) - LOCAL_ARM_MODE := arm #phLibNfc @@ -105,28 +104,17 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc.c 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 -DLLC_TRACE -DLOW_LEVEL_TRACES -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 - -ifeq ($(NFC_BUILD_VARIANT),debug) -LOCAL_CFLAGS += -DDEBUG -D_DEBUG -LOCAL_CFLAGS += -O0 -g -$(info DEBUG) -endif -ifeq ($(NFC_BUILD_VARIANT),release) -LOCAL_CFLAGS += -DNDEBUG -LOCAL_CFLAGS += -Os -LOCAL_CFLAGS += -Wl,-s -$(info RELEASE) -endif +LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -fno-strict-aliasing + +# Uncomment for Chipset command/responses +# Or use "setprop debug.nfc.LOW_LEVEL_TRACES" at run-time +# LOCAL_CFLAGS += -DLOW_LEVEL_TRACES + +# Uncomment for DAL traces +# LOCAL_CFLAGS += -DDEBUG -DDAL_TRACE + +# Uncomment for LLC traces +# LOCAL_CFLAGS += -DDEBUG -DLLC_TRACE #includes LOCAL_CFLAGS += -I$(LOCAL_PATH)/inc @@ -145,8 +133,6 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) - - LOCAL_SRC_FILES += src/phFriNfc_NdefRecord.c LOCAL_CFLAGS += -I$(LOCAL_PATH)/inc @@ -157,4 +143,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libcutils include $(BUILD_SHARED_LIBRARY) - |