aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-21 21:04:49 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-21 21:04:49 +0200
commit43a64c6867a81b193f5d9d68ab557db0f2457e7a (patch)
treeab06b29421e6e2692998ec23a8ff66793d8bbe5b
parent0f9be9b183f67d9f2d4f705bb115a0bb9b9a3be3 (diff)
downloadtcpdump-linaro_android_4.0.4.tar.gz
Use -O2 only if no other optimization level is requested Change-Id: I18399207ac8d7667a72869fa1039e448aa820d47 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--Android.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index cfd51812..318d6e10 100644
--- a/Android.mk
+++ b/Android.mk
@@ -119,7 +119,16 @@ LOCAL_SRC_FILES:=\
missing/strlcat.c\
missing/strlcpy.c
-LOCAL_CFLAGS := -O2 -g
+LOCAL_CFLAGS := -g
+# tcpdump can't be built without optimizations, so we enforce -O2 if no
+# other optimization flag is set - but we don't override what the global
+# flags are saying if something else is given (-Os or -O3 are useful)
+ifeq ($(findstring -O, $(TARGET_GLOBAL_CFLAGS)),)
+LOCAL_CFLAGS += -O2
+endif
+ifneq ($(findstring -O0, $(TARGET_GLOBAL_CFLAGS)),)
+LOCAL_CFLAGS += -O2
+endif
LOCAL_CFLAGS += -fno-strict-aliasing
LOCAL_CFLAGS += -DHAVE_CONFIG_H -D_U_="__attribute__((unused))"