diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-08 18:19:01 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-07-08 18:19:01 +0200 |
| commit | a0cd2ea15e2c664f523303703dd5aafc9351e833 (patch) | |
| tree | 2d2bac01ef3ae4607e38485e21246df4997f688f | |
| parent | 967359c892ff74962b4f4243d989f447ffe4ae11 (diff) | |
| parent | 7623b0c9fc569a2965135b474677cfd2324a3a13 (diff) | |
| download | libnfc-nxp-a0cd2ea15e2c664f523303703dd5aafc9351e833.tar.gz | |
merge intel x86 patches into gingerbread branch
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -110,7 +110,10 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c # 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 +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 |