From 77f63d23f7d380b0ff02c18fd6a154ab9063128a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 8 Jun 2009 15:18:21 +0200 Subject: Integrate FreeType 2.3.9 into the donut tree. This is done to get fixes for a few security-related issues. NOTE: the auto-hinter hasn't been changed to avoid modifying the rendering of characters. The 2.3.9 code contains minor fixes (not security-related) that could in theory do that (though extensive testing is needed to evaluate its real impact on Android). --- Android.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index a454f81..70b2e46 100644 --- a/Android.mk +++ b/Android.mk @@ -1,10 +1,10 @@ # this is now the default FreeType build for Android # ifndef USE_FREETYPE -USE_FREETYPE := 2.3.6 +USE_FREETYPE := 2.3.9 endif -ifeq ($(USE_FREETYPE),2.3.6) +ifeq ($(USE_FREETYPE),2.3.9) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -23,7 +23,6 @@ LOCAL_SRC_FILES:= \ src/base/ftsystem.c \ src/base/ftinit.c \ src/base/ftgasp.c \ - src/base/ftadvanc.c \ src/raster/raster.c \ src/sfnt/sfnt.c \ src/smooth/smooth.c \ @@ -42,13 +41,6 @@ LOCAL_CFLAGS += -fPIC -DPIC LOCAL_CFLAGS += "-DDARWIN_NO_CARBON" LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" -# only enable this if you want to enable our ugly font hack -# to be able to switch the system's font hinting at runtime -# through our modified Development Settings. the change will -# only happen when you reboot or restart an application -# -LOCAL_CFLAGS += -DANDROID_FONT_HACK=1 - # enable the FreeType internal memory debugger in the simulator # you need to define the FT2_DEBUG_MEMORY environment variable # when running the program to activate it. It will dump memory -- cgit v1.2.3