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

third_party/third_party.gyp

 # Copyright 2014 PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'defines': [
       'OPJ_STATIC',
       'PNG_PREFIX',
       'PNGPREFIX_H',
@@ skipping 29 matching lines @@
       ],
       'include_dirs': [
          'freetype/include',
          'freetype/include/freetype',
       ],
       'sources': [
         'freetype/include/freetype/freetype.h',
         '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',
         'freetype/src/base/ftinit.c',
         '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',
         'freetype/src/raster/raster.c',
         'freetype/src/sfnt/sfnt.c',
         'freetype/src/smooth/smooth.c',
         'freetype/src/truetype/truetype.c',
         'freetype/src/type1/type1.c',
-        'freetype/src/cid/type1cid.c',
       ],
     },
     {
       'target_name': 'fx_agg',
       'type': 'static_library',
       'sources': [
         'agg23/agg_basics.h',
         'agg23/agg_clip_liang_barsky.h',
         'agg23/agg_conv_dash.h',
         'agg23/agg_conv_stroke.h',
@@ skipping 252 matching lines @@
         'base/numerics/safe_conversions.h',
         'base/numerics/safe_conversions_impl.h',
         'base/numerics/safe_math.h',
         'base/numerics/safe_math_impl.h',
         'base/stl_util.h',
         'base/template_util.h',
       ],
     },
   ],
 }