[GN] Compile and initialize all font drivers.
Change-Id: I0254d768dca34e7e359df2e417b2031b7d51475b
diff --git a/BUILD.gn b/BUILD.gn
index 8e1f93e..4cff1ed 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,30 +13,39 @@
source_set("freetype2") {
sources = [
- # The following files are not sorted alphabetically, but in the
- # same order as in Android.mk to ease maintenance.
+ "src/autofit/autofit.c",
+ "src/base/ftbase.c",
"src/base/ftbbox.c",
"src/base/ftbitmap.c",
"src/base/ftfntfmt.c",
"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",
- "src/base/ftinit.c",
"src/base/ftgasp.c",
+ "src/base/ftglyph.c",
+ "src/base/ftinit.c",
+ "src/base/ftlcdfil.c",
"src/base/ftmm.c",
+ "src/base/ftstroke.c",
+ "src/base/ftsystem.c",
+ "src/base/fttype1.c",
"src/gzip/ftgzip.c",
+ "src/lzw/ftlzw.c",
+ "src/psaux/psaux.c",
+ "src/pshinter/pshinter.c",
+ "src/psnames/psnames.c",
"src/raster/raster.c",
"src/sfnt/sfnt.c",
"src/smooth/smooth.c",
- "src/autofit/autofit.c",
- "src/truetype/truetype.c",
- "src/cff/cff.c",
- "src/psnames/psnames.c",
- "src/pshinter/pshinter.c",
+
+ # Font Drivers. Drivers need to be enabled in ftmodule.h explicitly.
+ "src/bdf/bdf.c", # Glyph Bitmap Distribution Format
+ "src/cff/cff.c", # OpenType, (.cff, .cef)
+ "src/cid/type1cid.c", # Postscript CID-keyed (.pfb, .pfa)
+ "src/pcf/pcf.c", # Portable Compiled Format
+ "src/pfr/pfr.c", # Portable Font Resource
+ "src/truetype/truetype.c", # TrueType
+ "src/type1/type1.c", # Postscript Type 1 (.pfb, .pfa)
+ "src/type42/type42.c", # Postscript Type 42
+ "src/winfonts/winfnt.c", # Windows Bitmap Fonts, (.fon, .fnt)
]
defines = [
diff --git a/include/freetype-fuchsia-config/ftmodule.h b/include/freetype-fuchsia-config/ftmodule.h
index 8ec70b8..6962771 100644
--- a/include/freetype-fuchsia-config/ftmodule.h
+++ b/include/freetype-fuchsia-config/ftmodule.h
@@ -17,7 +17,14 @@
FT_USE_MODULE( FT_Module_Class, autofit_module_class )
FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
+FT_USE_MODULE( FT_Module_Class, psaux_module_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 )
@@ -25,14 +32,4 @@
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
-
-/*
-FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
-FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
-FT_USE_MODULE( FT_Module_Class, psaux_module_class )
-*/