Revert 187283

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 164 matching lines @@
         'ext/platform_device.cc',
         'ext/platform_device.h',
         'ext/platform_device_linux.cc',
         'ext/platform_device_mac.cc',
         'ext/platform_device_win.cc',
         'ext/refptr.h',
         'ext/SkMemory_new_handler.cpp',
         'ext/skia_sandbox_support_win.h',
         'ext/skia_sandbox_support_win.cc',
         'ext/skia_trace_shim.h',
-        'ext/skia_utils_base.cc',
-        'ext/skia_utils_base.h',
         'ext/skia_utils_ios.mm',
         'ext/skia_utils_ios.h',
         'ext/skia_utils_mac.mm',
         'ext/skia_utils_mac.h',
         'ext/skia_utils_win.cc',
         'ext/skia_utils_win.h',
         'ext/vector_canvas.cc',
         'ext/vector_canvas.h',
         'ext/vector_platform_device_emf_win.cc',
         'ext/vector_platform_device_emf_win.h',
@@ skipping 172 matching lines @@
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:freetype2',
             '../build/linux/system.gyp:pangocairo',
             '../third_party/icu/icu.gyp:icuuc',
           ],
           'cflags': [
             '-Wno-unused',
             '-Wno-unused-function',
           ],
           'sources': [
-            '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
-            '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
-          ],
-          'sources!': [
-            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
+            'ext/SkFontHost_fontconfig.cpp',
+            'ext/SkFontHost_fontconfig_direct.cpp',
           ],
           'defines': [
 #            'SK_USE_COLOR_LUMINANCE',
           ],
         }],
         [ 'use_glib == 0 and OS != "android"', {
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
             '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
@@ skipping 460 matching lines @@
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         },
       ],
     }],
   ],
 }