From a2b9955b49034a51dfbc8bf9f4e9d312149cecac Mon Sep 17 00:00:00 2001
From: Xianzhu Wang <wangxianzhu@chromium.org>
Date: Mon, 16 Dec 2013 15:51:29 -0800
Subject: Update freetype to latest version of ASOP.

This added support of color glyphs.

BUG=290583

Review URL: https://codereview.chromium.org/89753003/
---
 freetype.gyp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'freetype.gyp')

diff --git a/freetype.gyp b/freetype.gyp
index 23463c7..22e22a9 100644
--- a/freetype.gyp
+++ b/freetype.gyp
@@ -11,18 +11,20 @@
           'type': 'static_library',
           'toolsets': ['target'],
           'sources': [
+            # The following files are not sorted alphabetically, but in the
+            # same order as in Android.mk to ease maintenance.
             'src/base/ftbbox.c',
             'src/base/ftbitmap.c',
             'src/base/ftfstype.c',
             'src/base/ftglyph.c',
             'src/base/ftlcdfil.c',
             'src/base/ftstroke.c',
+            'src/base/fttype1.c',
             'src/base/ftxf86.c',
             'src/base/ftbase.c',
             'src/base/ftsystem.c',
             'src/base/ftinit.c',
             'src/base/ftgasp.c',
-            'src/base/fttype1.c',
             'src/raster/raster.c',
             'src/sfnt/sfnt.c',
             'src/smooth/smooth.c',
@@ -32,6 +34,10 @@
             'src/psnames/psnames.c',
             'src/pshinter/pshinter.c',
           ],
+          'dependencies': [
+            '../libpng/libpng.gyp:libpng',
+            '../zlib/zlib.gyp:zlib',
+          ],
           'include_dirs': [
             'build',
             'include',
-- 
cgit v1.2.3