aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2017-03-29 22:22:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-29 22:22:30 +0000
commit46879d6863795c91098407bf4a1603a4634daaa1 (patch)
treebc0ef567c3e5eba136cad12ea1a62eff50697419
parent9fd8f0b80d0d4e10794a438dacbabbe66f01ae02 (diff)
parent9f89d8b7f271e32475af103a5c7763d87c23d756 (diff)
downloadfreetype-46879d6863795c91098407bf4a1603a4634daaa1.tar.gz
Revert "Drop a few unnecessary modules"
am: 9f89d8b7f2 Change-Id: I8a74a509c7d878b2c7fa330e41d42b0c3a4c3641
-rw-r--r--Android.bp2
-rw-r--r--README.android1
-rw-r--r--include/freetype/config/ftmodule.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 482c78176..806638646 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,7 @@ cc_library_shared {
"src/base/ftfstype.c",
"src/base/ftglyph.c",
"src/base/ftlcdfil.c",
+ "src/base/ftstroke.c",
"src/base/fttype1.c",
"src/base/ftbase.c",
"src/base/ftsystem.c",
@@ -24,6 +25,7 @@ cc_library_shared {
"src/base/ftgasp.c",
"src/base/ftmm.c",
"src/gzip/ftgzip.c",
+ "src/raster/raster.c",
"src/sfnt/sfnt.c",
"src/smooth/smooth.c",
"src/autofit/autofit.c",
diff --git a/README.android b/README.android
index dc97ac074..3f599a05b 100644
--- a/README.android
+++ b/README.android
@@ -9,7 +9,6 @@ The following modules are disabled in include/freetype/config/ftmodule.h:
pcf
psaux
bdf
- ft_raster1_renderer
The following options are disabled in include/freetype/config/ftoption.h:
diff --git a/include/freetype/config/ftmodule.h b/include/freetype/config/ftmodule.h
index 338dee75f..e145790da 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -15,6 +15,7 @@ FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )