diff options
author | Philip P. Moltmann <moltmann@google.com> | 2018-02-22 18:33:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-22 18:33:43 +0000 |
commit | 99fee66607b5afe9153b7e8d455f258ecfb3089f (patch) | |
tree | 3ee845a9bd682ecb350209fed28b786ca2503b16 | |
parent | 7dd96fcef425f9e7c9c085b91187151678b82363 (diff) | |
parent | bc22e72d162cae6694ef295f281269d7abd56f2a (diff) | |
download | freetype-99fee66607b5afe9153b7e8d455f258ecfb3089f.tar.gz |
Merge "Enable Type1 and Type1CID fonts"android-wear-p-preview-2android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | include/freetype/config/ftmodule.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 29015f3ae..4b6a34e11 100644 --- a/Android.bp +++ b/Android.bp @@ -34,6 +34,8 @@ cc_library_shared { "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 157246171..92af59321 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 ) |