Improve Skia configuration.

skia/skia_library.gypi

 # Copyright 2013 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 {
   'dependencies': [
@@ skipping 77 matching lines @@
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.h',
     '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',
     '../third_party/skia/src/ports/SkFontHost_mac.cpp',
     '../third_party/skia/src/ports/SkFontHost_win.cpp',
     '../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
     '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
     '../third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp',
     '../third_party/skia/src/ports/SkOSFile_posix.cpp',
     '../third_party/skia/src/ports/SkOSFile_stdio.cpp',
     '../third_party/skia/src/ports/SkOSFile_win.cpp',
-    '../third_party/skia/src/ports/SkThread_pthread.cpp',

[bungeman-chromium, 2013/10/09 21:35:07]

Note that aside from these two lines (and the mention of SkThread_pthread.cpp
below), all of this change can go in now, with these three lines being part of
the roll after https://codereview.chromium.org/19808007/ .

-    '../third_party/skia/src/ports/SkThread_win.cpp',
     '../third_party/skia/src/ports/SkTime_Unix.cpp',
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
 
     '../third_party/skia/src/sfnt/SkOTTable_name.cpp',
     '../third_party/skia/src/sfnt/SkOTTable_name.h',
     '../third_party/skia/src/sfnt/SkOTUtils.cpp',
     '../third_party/skia/src/sfnt/SkOTUtils.h',
 
     '../third_party/skia/include/utils/mac/SkCGUtils.h',
@@ skipping 32 matching lines @@
     '../third_party/skia/include/images/SkImageRef.h',
     '../third_party/skia/include/images/SkImageRef_GlobalPool.h',
     '../third_party/skia/include/images/SkMovie.h',
     '../third_party/skia/include/images/SkPageFlipper.h',
 
     '../third_party/skia/include/utils/SkNullCanvas.h',
     '../third_party/skia/include/utils/SkPictureUtils.h',
     '../third_party/skia/include/utils/SkProxyCanvas.h',
   ],
   'include_dirs': [
-    '..',
-    'config',
     '../third_party/skia/include/config',

[djsollen, 2013/10/11 15:24:08]

why do we ever want to include this?

     '../third_party/skia/include/core',
     '../third_party/skia/include/effects',
     '../third_party/skia/include/images',
     '../third_party/skia/include/lazy',
     '../third_party/skia/include/pathops',
     '../third_party/skia/include/pdf',
     '../third_party/skia/include/pipe',
     '../third_party/skia/include/ports',
     '../third_party/skia/include/utils',
     '../third_party/skia/src/core',
@@ skipping 193 matching lines @@
           '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
         ],
       },
       'sources': [
         '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
       ],
     }],
     [ 'OS == "win"', {
       'sources!': [
         '../third_party/skia/src/ports/SkOSFile_posix.cpp',
-        '../third_party/skia/src/ports/SkThread_pthread.cpp',
         '../third_party/skia/src/ports/SkTime_Unix.cpp',
         '../third_party/skia/src/ports/SkTLS_pthread.cpp',
       ],
       'include_dirs': [
         '../third_party/skia/include/utils/win',
         '../third_party/skia/src/utils/win',
       ],
       'defines': [
         'SK_FONTHOST_USES_FONTMGR',
       ],
@@ skipping 55 matching lines @@
     'SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS',
 
     'SK_DEFAULT_FONT_CACHE_LIMIT=<(default_font_cache_limit)',
   ],
 
   'direct_dependent_settings': {
     'include_dirs': [
       #temporary until we can hide SkFontHost
       '../third_party/skia/src/core',
 
-      'config',
       '../third_party/skia/include/config',
       '../third_party/skia/include/core',
       '../third_party/skia/include/effects',
       '../third_party/skia/include/pdf',
       '../third_party/skia/include/gpu',
       '../third_party/skia/include/lazy',
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
     'defines': [
       '<@(skia_export_defines)',
     ],
   },
 }