diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:51:12 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-23 15:51:12 +0000 |
| commit | bcc6d7d390083c6c8ce04b2078ee2904399b8435 (patch) | |
| tree | 726bce9e5cc0d9391a0cf64aa3758b84bab92b48 /gyp | |
| parent | a82c9eb5984d7bac69980a52ecac8bbc032802e1 (diff) | |
Update freetype to version 2.5.0.1 when building it from source.
R=bungeman@google.com
Review URL: https://codereview.chromium.org/19625006
git-svn-id: http://skia.googlecode.com/svn/trunk@10273 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/freetype.gyp | 4 | ||||
| -rw-r--r-- | gyp/images.gyp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 8800674f6f..91c92b7522 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -79,12 +79,11 @@ # auxiliary modules (optional) '../third_party/externals/freetype/src/autofit/autofit.c', # auto hinting module - '../third_party/externals/freetype/src/psaux/psaux.c', # PostScript Type 1 parsing '../third_party/externals/freetype/src/pshinter/pshinter.c', # PS hinting module '../third_party/externals/freetype/src/psnames/psnames.c', # PostScript glyph names support ], 'include_dirs': [ - '../third_party/freetype', + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/internal', '../third_party/externals/freetype/builds', '../third_party/externals/freetype/include', @@ -95,6 +94,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ + '../third_party/freetype/include_overrides', '../third_party/externals/freetype/include', ], }, diff --git a/gyp/images.gyp b/gyp/images.gyp index 76df7d178e..6d3b009f63 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -136,6 +136,9 @@ 'android_deps.gyp:gif', 'android_deps.gyp:png', ], + 'export_dependent_settings': [ + 'android_deps.gyp:png' + ], },{ #else if skia_os != android 'sources!': [ '../src/images/SkImageRef_ashmem.h', |