Update Android FreeType version.

gyp/freetype.gypi

Index: gyp/freetype.gypi
diff --git a/gyp/freetype.gypi b/gyp/freetype.gypi
index 9dc80b04510c608fd3a552fb623d0c06f9af70ca..b95fac0d29562cdf7d64fba8bcb407151ef145b5 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>

[djsollen, 2015/10/27 13:00:00]

so this file is no longer needed?

[bungeman-skia, 2015/10/27 14:21:44]

It got renamed to ftfntfmt.c, so I'm just updating the name here.

+    '../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', {