summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBruce Beare <bruce.j.beare@intel.com>2010-12-26 10:16:36 -0800
committerBruce Beare <bruce.j.beare@intel.com>2010-12-26 10:16:36 -0800
commit064d3925fa07c9612f41960b111d59030ccff614 (patch)
tree06a0b277f7be7a387ca995fd394748ae137b18a1 /Android.mk
parentb70c3011edf13b3b79dddaefb971b6fd7c33e193 (diff)
downloadexternal_libnfc-nxp-064d3925fa07c9612f41960b111d59030ccff614.zip
external_libnfc-nxp-064d3925fa07c9612f41960b111d59030ccff614.tar.gz
external_libnfc-nxp-064d3925fa07c9612f41960b111d59030ccff614.tar.bz2
Don't set ARM flags for non arm builds
Change-Id: Iee47aaa4c341812ed6671abc8b19bdd9dc4f77cf Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f4be49a..5c90687 100644
--- a/Android.mk
+++ b/Android.mk
@@ -101,7 +101,11 @@ LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_i2c.c
LOCAL_SRC_FILES += Linux_x86/phDal4Nfc_messageQueueLib.c
#LOCAL_CFLAGS += -DNXP_MESSAGING -DANDROID -DDEBUG -DLLC_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 -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 -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