Clean up poppler code.

gyp/freetype.gyp

 # Target for building freetype.
 {
   'targets': [
     {
       'target_name': 'freetype',
       'type': 'none',
       'conditions': [
         [ 'skia_freetype_static',
           {
             'dependencies': [
@@ skipping 63 matching lines @@
     },
     {
       'target_name': 'freetype_static',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         # we are dependent upon PNG for color emoji glyphs
         'libpng.gyp:libpng',
       ],
       'includes': [
-        # common freetype sources needed for both the base Skia build and the
-        # libpoppler build for testing only
+        # TODO: merge this back in here?
         'freetype.gypi',
       ],
       'include_dirs': [
         '../third_party/freetype/include_overrides',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/freetype/include_overrides',
         ],
       },
       'conditions': [
         [ 'skia_os == "android"', {
           # These flags are used by the Android OS.  They are probably overkill
           # for Skia, but we add them for consistency.
           'cflags': [
             '-W',
             '-Wall',
             '-fPIC',
             '-DPIC',
             '-DDARWIN_NO_CARBON',
             '-DFT2_BUILD_LIBRARY',
             '-O2',
           ],
         }],
       ],
     },
-    {
-      'target_name': 'freetype_poppler',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'includes': [
-        'freetype.gypi',
-      ],
-      'sources': [
-        # additional components used by poppler
-        '../third_party/externals/freetype/src/base/ftbdf.c',
-        '../third_party/externals/freetype/src/base/ftpfr.c',
-
-        '../third_party/externals/freetype/src/bdf/bdf.c',
-        '../third_party/externals/freetype/src/cid/type1cid.c',
-        '../third_party/externals/freetype/src/pcf/pcf.c',
-        '../third_party/externals/freetype/src/pfr/pfr.c',
-        '../third_party/externals/freetype/src/psaux/psaux.c',
-        '../third_party/externals/freetype/src/type1/type1.c',
-        '../third_party/externals/freetype/src/type42/type42.c',
-        '../third_party/externals/freetype/src/winfonts/winfnt.c',
-
-        '../third_party/externals/freetype/src/gzip/ftgzip.c',
-        '../third_party/externals/freetype/src/lzw/ftlzw.c',
-      ],
-    },
   ],
 }