Snap for 4620899 from f7b46c0241c54fb49f3072380a67107a6729daec to pi-release
Change-Id: I4a3823cf3a82617ba7a6362ba6eb1437552bae4d
diff --git a/Android.bp b/Android.bp
index 29015f3..4b6a34e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,8 @@
"src/psnames/psnames.c",
"src/pshinter/pshinter.c",
"src/psaux/psaux.c",
+ "src/type1/type1.c",
+ "src/cid/type1cid.c",
],
export_include_dirs: ["include"],
diff --git a/include/freetype/config/ftmodule.h b/include/freetype/config/ftmodule.h
index 1572461..92af593 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -12,9 +12,9 @@
// ANDROID: commented out ones are not needed for android, previously they were deleted
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, 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, 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 )
