From 7623b0c9fc569a2965135b474677cfd2324a3a13 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Tue, 31 May 2011 13:49:55 -0700 Subject: Don't set ARM flags for non arm builds Change-Id: Ia57a9aa018a4a5d1cd5b9a4bc562bc5cc061484a Orig-Change-Id: Iee47aaa4c341812ed6671abc8b19bdd9dc4f77cf Signed-off-by: Bruce Beare --- Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3