diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 18:41:40 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 18:41:40 +0000 |
| commit | 517cd751492bf9d777483052fb86b96c37b632a3 (patch) | |
| tree | 9b3b55ac6a4e461d07c4a93140d357251ef061ae /third_party/libpng/libpng.gyp | |
| parent | 2c1e1b1774d4eeef9c1461057079227371b0a8da (diff) | |
| download | chromium_src-517cd751492bf9d777483052fb86b96c37b632a3.zip chromium_src-517cd751492bf9d777483052fb86b96c37b632a3.tar.gz chromium_src-517cd751492bf9d777483052fb86b96c37b632a3.tar.bz2 | |
Roll third_party/freetype to @a2b9955b49034a51dfbc8bf9f4e9d312149cecac.
This adds support of color glyphs.
The freetype version is between 2.4.12 and 2.5.0.
Updated libpng accordingly which is required by the new freetype.
BUG=290583
R=phajdan.jr@chromium.org
TBR=darin
Review URL: https://codereview.chromium.org/89813002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/libpng.gyp')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 38082f4..ac8fdb4 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -71,6 +71,14 @@ }], ['OS=="android"', { 'toolsets': ['target', 'host'], + 'defines': [ + 'CHROME_PNG_READ_PACK_SUPPORT', # Required by freetype. + ], + 'direct_dependent_settings': { + 'defines': [ + 'CHROME_PNG_READ_PACK_SUPPORT', + ], + }, }], ], }, |