commit f7b46c0241c54fb49f3072380a67107a6729daec
author Philip P. Moltmann <moltmann@google.com> Thu Feb 22 19:02:30 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 22 19:02:30 2018 +0000
tree 3ee845a9bd682ecb350209fed28b786ca2503b16
parent 20e42f26cec22de86ea34e55a7baddf11efed80b
parent 6e91d7b311fc28620c462b9a9208f4abbf040795

Merge "Enable Type1 and Type1CID fonts" am: 99fee66607 am: 719f26ee7b
am: 6e91d7b311

Change-Id: I44e86f44b510fdbdb2dbb1ad4a25e7a8f6423618

Android.bp

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"],

include/freetype/config/ftmodule.h

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 )