diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-29 12:31:42 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-29 12:31:42 -0800 |
| commit | 249c1dc6bf2a247120b3f4ef11c7ab17de94b0b8 (patch) | |
| tree | 5864dd225b9633248a9bf17a05fa63ec792f99cc /Android.mk | |
| parent | 80ee29b88ec489e2bbf6ae446692229d36755429 (diff) | |
| parent | 064d3925fa07c9612f41960b111d59030ccff614 (diff) | |
| download | external_libnfc-nxp-249c1dc6bf2a247120b3f4ef11c7ab17de94b0b8.zip external_libnfc-nxp-249c1dc6bf2a247120b3f4ef11c7ab17de94b0b8.tar.gz external_libnfc-nxp-249c1dc6bf2a247120b3f4ef11c7ab17de94b0b8.tar.bz2 | |
Merge 064d3925 from open-source master
Change-Id: Ic81dffce6a683298fa97f473c469009313fc5647
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -104,7 +104,11 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_i2c.c LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c #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 -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 -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 |