diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-08 15:18:21 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-08 15:18:21 +0200 |
| commit | 77f63d23f7d380b0ff02c18fd6a154ab9063128a (patch) | |
| tree | 14b8437e23a816c57512fe472fdef4c7875c2eba /Android.mk | |
| parent | d04869994887b14ee43c9f8a9a8597193b5a7107 (diff) | |
| download | android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.gz android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.tar.bz2 android_external_freetype-77f63d23f7d380b0ff02c18fd6a154ab9063128a.zip | |
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).
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -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 |