diff options
| author |  bungeman <bungeman@google.com> | 2015-10-27 08:39:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-27 08:39:39 -0700 |
| commit | 13dd023882d675cf0f728a8037858a05858397b8 (patch) | |
| tree | 093ea342d4a92df35e56c5976462c9ca0ad9e175 /gyp | |
| parent | 27c172885f6e37d9107d4c563ef7988734e68506 (diff) | |
Update Android FreeType version.
Update FreeType to a newer version. Because this caused issues in
finding the correct ftoptions.h and ftmodule.h [1], be sure to state
the ones we want explicitly.
This also add gzip.c which is needed for WOFF support [2].
[1] FreeType "Simplify header file hierarchy."
fae382076409db198dfbff36ac4cbb97b05b30a1
[2] FreeType "[gzip] New function `FT_Gzip_Uncompress'."
dc240524ff31891a442225430b28e9620c1fa89f
Review URL: https://codereview.chromium.org/833103004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/freetype.gyp | 8 | ||||
| -rw-r--r-- | gyp/freetype.gypi | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 85018a49ac..94ab94cc3c 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -88,14 +88,6 @@ # TODO: merge this back in here? 'freetype.gypi', ], - 'include_dirs': [ - '../third_party/freetype/include_overrides', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../third_party/freetype/include_overrides', - ], - }, 'conditions': [ [ 'skia_os == "android"', { # These flags are used by the Android OS. They are probably overkill diff --git a/gyp/freetype.gypi b/gyp/freetype.gypi index 9dc80b0451..b95fac0d29 100644 --- a/gyp/freetype.gypi +++ b/gyp/freetype.gypi @@ -23,7 +23,9 @@ '../third_party/externals/freetype/src/base/ftsynth.c', # optional, see <freetype/ftsynth.h> '../third_party/externals/freetype/src/base/fttype1.c', # optional, see <freetype/t1tables.h> '../third_party/externals/freetype/src/base/ftwinfnt.c', # optional, see <freetype/ftwinfnt.h> - '../third_party/externals/freetype/src/base/ftxf86.c', # optional, see <freetype/ftxf86.h> + '../third_party/externals/freetype/src/base/ftfntfmt.c', # optional, see <freetype/ftfntfmt.h> + '../third_party/externals/freetype/src/gzip/ftgzip.c', # required for sfnt/sfnt.c + # (with FT_CONFIG_OPTION_USE_ZLIB) # font drivers (optional; at least one is needed) '../third_party/externals/freetype/src/cff/cff.c', # CFF/OpenType font driver @@ -40,6 +42,7 @@ '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ + '../third_party/freetype', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -47,6 +50,8 @@ ], 'defines': [ 'FT2_BUILD_LIBRARY', + 'FT_CONFIG_MODULES_H=<include/freetype-android/ftmodule.h>', + 'FT_CONFIG_OPTIONS_H=<include/freetype-android/ftoption.h>', ], 'conditions': [ [ 'skia_warnings_as_errors', { |