Merge to XFA: Fix incorrect paths in third_party.gyp.

third_party/third_party.gyp

Index: third_party/third_party.gyp
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 6d1661526deac1aa2171a9a9e7cbb91b36d6d7ee..378b2058dc4d38e3c8069e82b03f86f13aa70e26 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -47,14 +47,11 @@
         'freetype/include/freetype/ftmm.h',
         'freetype/include/freetype/ftotval.h',
         'freetype/include/freetype/ftoutln.h',
-        'freetype/include/freetype/internal/freetype/ftobjs.h',
-        'freetype/include/freetype/internal/freetype/ftstream.h',
-        'freetype/include/freetype/internal/freetype/tttypes.h',
+        'freetype/include/freetype/internal/ftobjs.h',
+        'freetype/include/freetype/internal/ftstream.h',
+        'freetype/include/freetype/internal/tttypes.h',
         'freetype/include/freetype/tttables.h',
         'freetype/include/ft2build.h',
-        'freetype/src/cff/cffobjs.h',
-        'freetype/src/cff/cfftypes.h',
-        'freetype/src/cff/cff.c',
         'freetype/src/base/ftbase.c',
         'freetype/src/base/ftbitmap.c',
         'freetype/src/base/ftglyph.c',
@@ -62,6 +59,10 @@
         'freetype/src/base/ftlcdfil.c',
         'freetype/src/base/ftmm.c',
         'freetype/src/base/ftsystem.c',
+        'freetype/src/cff/cff.c',
+        'freetype/src/cff/cffobjs.h',
+        'freetype/src/cff/cfftypes.h',
+        'freetype/src/cid/type1cid.c',
         'freetype/src/psaux/psaux.c',
         'freetype/src/pshinter/pshinter.c',
         'freetype/src/psnames/psmodule.c',
@@ -70,7 +71,6 @@
         'freetype/src/smooth/smooth.c',
         'freetype/src/truetype/truetype.c',
         'freetype/src/type1/type1.c',
-        'freetype/src/cid/type1cid.c',
       ],
     },
     {