diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-02-22 19:02:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-22 19:02:30 +0000 |
| commit | f7b46c0241c54fb49f3072380a67107a6729daec (patch) | |
| tree | 3ee845a9bd682ecb350209fed28b786ca2503b16 | |
| parent | 20e42f26cec22de86ea34e55a7baddf11efed80b (diff) | |
| parent | 6e91d7b311fc28620c462b9a9208f4abbf040795 (diff) | |
| download | freetype-pie-qpr3-s1-release.tar.gz | |
Merge "Enable Type1 and Type1CID fonts" am: 99fee66607 am: 719f26ee7bandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 6e91d7b311
Change-Id: I44e86f44b510fdbdb2dbb1ad4a25e7a8f6423618
| -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 ) |