summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Beare <bruce.j.beare@intel.com>2011-05-31 13:49:55 -0700
committerDavid 'Digit' Turner <digit@google.com>2011-07-07 03:45:58 +0200
commit7623b0c9fc569a2965135b474677cfd2324a3a13 (patch)
tree2d2bac01ef3ae4607e38485e21246df4997f688f
parent967359c892ff74962b4f4243d989f447ffe4ae11 (diff)
downloadlibnfc-nxp-7623b0c9fc569a2965135b474677cfd2324a3a13.tar.gz
Don't set ARM flags for non arm builds
Change-Id: Ia57a9aa018a4a5d1cd5b9a4bc562bc5cc061484a Orig-Change-Id: Iee47aaa4c341812ed6671abc8b19bdd9dc4f77cf Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 8f64cba..79c5fb7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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