Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs
R=bungeman@google.com
Review URL: https://codereview.chromium.org/19931003
git-svn-id: http://skia.googlecode.com/svn/trunk@10259 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index 91fc0b3..8800674 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -42,6 +42,10 @@
'target_name': 'freetype_static',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ # we are dependent upon PNG for color emoji glyphs
+ 'images.gyp:images'
+ ],
'sources': [
# base components (required)
'../third_party/externals/freetype/src/base/ftsystem.c',
@@ -80,6 +84,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',
@@ -94,6 +99,11 @@
],
},
'conditions': [
+ [ 'skia_warnings_as_errors', {
+ 'cflags!': [
+ '-Werror',
+ ],
+ }],
[ 'skia_os == "mac"', {
'sources': [
'../third_party/externals/freetype/src/base/ftmac.c', # only on the Macintosh