Improve Skia configuration.

skia/skia_common.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 handles the removal of platform-specific files from the
 # Skia build.
 {
   'conditions': [
     [ 'OS != "android"', {
       'sources/': [
@@ skipping 11 matching lines @@
       ],
     }],
     [ 'OS != "win"', {
       'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
     }],
     [ 'use_glib == 0', {
       'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
     }],
   ],
 
+  'variables': {
+    'variables': { 'conditions': [
+      [ 'OS == "win"', {
+        'skia_atomics_impl': 'win',
+        'skia_mutex_impl': 'win',
+      }, {

[bungeman-chromium, 2013/09/26 22:42:46]

djsollen: is there something that needs to go here for android framework?

[djsollen, 2013/09/27 13:52:25]

If the OS is android and use_system_skia is defined to 1 then you'll want to use
the android headers.

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

Done.

+        'skia_atomics_impl': 'sync',
+        'skia_mutex_impl': 'pthread',
+      }],
+    ]},
+    'skia_threading_defines': [
+      'SK_ATOMICS_PLATFORM_H="third_party/skia/src/ports/SkAtomics_<(skia_atomics_impl).h"',
+      'SK_MUTEX_PLATFORM_H="third_party/skia/src/ports/SkMutex_<(skia_mutex_impl).h"',
+    ],
+  },
+
+  'defines': [
+    '<@(skia_threading_defines)',
+  ],
+
+  'direct_dependent_settings': {
+    'defines': [
+      '<@(skia_threading_defines)',
+    ],
+  },
+
   'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
 }