summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-07 19:08:27 +0059
committerEvan McClain <aeroevan@gmail.com>2012-06-08 14:03:18 -0400
commit7c8acbadb78c24ad8bbbe6bdbc4c527df105003b (patch)
treefc95236f1f3a31350018ba2db86737b4666daffa
parent734149b590198960997b5cb88683c45da215c7fd (diff)
downloadandroid_external_freetype-ics-release.tar.gz
android_external_freetype-ics-release.tar.bz2
android_external_freetype-ics-release.zip
freetype: Build with -fno-strict-aliasingics-releaseicscm-9.1.0
Freetype's code is not quite ready to be built with strict aliasing rules enforced. Add -fno-strict-aliasing here so we can disable the global -fno-strict-aliasing bit. Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> freetype: Don't force -O2 There's a -O2 hardcode in Android.mk - its purpose is to make sure freetype gets built with optimizations enabled, but it is done in a way that overrides other optimization flags such as -O3 or -Os. Only set -O2 if no other optimization level is requested. Conflicts: Android.mk Change-Id: I1c6191c850afa940a89269a95ce686c2fd422640 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Signed-off-by: Evan McClain <aeroevan@gmail.com>
-rw-r--r--Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index d5b92a5..3fae9ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,6 +41,7 @@ LOCAL_CFLAGS += -W -Wall
LOCAL_CFLAGS += -fPIC -DPIC
LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
+LOCAL_CFLAGS += -fno-strict-aliasing
# the following is for testing only, and should not be used in final builds
# of the product
@@ -50,7 +51,15 @@ ifeq ($(BOARD_USE_SKIA_LCDTEXT),true)
LOCAL_CFLAGS += "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING"
endif
+# Freetype 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_MODULE:= libft2