Improve Skia configuration.

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.
 
 {
   'conditions': [
     # In component mode (shared_lib), we build all of skia as a single DLL.
     # However, in the static mode, we need to build skia as multiple targets
     # in order to support the use case where a platform (e.g. Android) may
     # already have a copy of skia as a system library.
     ['component=="static_library" and use_system_skia==0', {
       'targets': [
         {
           'target_name': 'skia_library',
           'type': 'static_library',
           'includes': [
+            'skia_common.gypi',

[bungeman-skia, 2013/09/27 17:59:13]

Needed to make skia_common first in order to have it's includes come first.

             'skia_library.gypi',
-            'skia_common.gypi',
           ],
         },
       ],
     }],
     ['component=="static_library" and use_system_skia==1', {
       'targets': [
         {
           'target_name': 'skia_library',
           'type': 'none',
           'includes': ['skia_system.gypi'],
@@ skipping 11 matching lines @@
           ],
           'export_dependent_settings': [
             'skia_library',
             'skia_chrome',
           ],
         },
         {
           'target_name': 'skia_chrome',
           'type': 'static_library',
           'includes': [
+            'skia_common.gypi',
             'skia_chrome.gypi',
-            'skia_common.gypi',
           ],
         },
       ],
     },
     {  # component != static_library
       'targets': [
         {
           'target_name': 'skia',
           'type': 'shared_library',
           'includes': [
+            'skia_common.gypi',
             'skia_library.gypi',
             'skia_chrome.gypi',
-            'skia_common.gypi',
           ],
           'defines': [
             'SKIA_DLL',
             'SKIA_IMPLEMENTATION=1',
           ],
           'direct_dependent_settings': {
             'defines': [
               'SKIA_DLL',
             ],
           },
@@ skipping 52 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }