diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
| commit | ee49e074127d93fccae763baaec3e93b6728ff80 (patch) | |
| tree | 99a277e9a0ed635ffc8aaf8179dcba5ebc0cf9cd /Android.mk | |
| parent | 989b6c878d007b154ca92273b4266686f8dbc315 (diff) | |
| parent | 77f63d23f7d380b0ff02c18fd6a154ab9063128a (diff) | |
| download | android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.gz android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.bz2 android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.zip | |
resolved conflicts for merge 77f63d to master
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,10 @@ +# this is now the default FreeType build for Android +# +ifndef USE_FREETYPE +USE_FREETYPE := 2.3.9 +endif + +ifeq ($(USE_FREETYPE),2.3.9) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -16,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 \ @@ -53,4 +59,4 @@ LOCAL_CFLAGS += -O2 LOCAL_MODULE:= libft2 include $(BUILD_STATIC_LIBRARY) - +endif |