aura: Make 'skia' target build and link without gtk.

skia/skia.gyp

 # Copyright (c) 2011 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)',
       'sources': [
@@ skipping 725 matching lines @@
         [ 'OS != "mac"', {
           'sources/': [
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/']
           ],
           'sources': [
             '../third_party/skia/include/utils/SkMatrix44.h',
             '../third_party/skia/src/utils/SkMatrix44.cpp',
           ],
         }],
-        [ 'toolkit_uses_gtk == 0', {
-          'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ],
-          'sources!': [
-            '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
-            '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp',
-            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
-            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
-            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
-          ],
-        }],
         [ 'OS == "android"', {
           'sources/': [
             ['include', 'ext/platform_device_linux.cc'],
             ['include', 'ext/platform_canvas_linux.cc'],
           ],
         }, { # OS != "android"
           'sources/': [ ['exclude', '_android\\.(cc|cpp)$'] ],
         }],
         [ 'OS != "win"', {
           'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
         }],
         [ 'armv7 == 1', {
           'defines': [
             '__ARM_ARCH__=7',
           ],
         }],
         [ 'armv7 == 1 and arm_neon == 1', {
           'defines': [
             '__ARM_HAVE_NEON',
           ],
         }],
         [ 'target_arch == "arm"', {
           'sources!': [
             '../third_party/skia/src/opts/opts_check_SSE2.cpp'
           ],
         }],
-        [ 'toolkit_uses_gtk == 1', {
+        [ 'use_glib == 1', {

[Nico, 2011/09/19 21:58:09]

Where is this set? I don't see it in
http://codesearch.google.com/codesearch#search/&exact_package=chromium&q=use_...

[sadrul, 2011/09/19 22:00:10]

This will happen, presumably soon, with http://codereview.chromium.org/7904034/

           'dependencies': [
-            '../build/linux/system.gyp:gdk',
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:freetype2',
             '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
             '../third_party/icu/icu.gyp:icuuc',
           ],
           'cflags': [
             '-Wno-unused',
             '-Wno-unused-function',
           ],
           'sources': [
             'ext/SkFontHost_fontconfig.cpp',
             'ext/SkFontHost_fontconfig_direct.cpp',
           ],
           'defines': [
             'SK_MAX_SIZE_FOR_LCDTEXT=256',
           ],
+        }, {  # use_glib == 0
+          'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
+          'sources!': [
+            '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
+            '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp',
+            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
+            '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
+            '../third_party/skia/src/ports/SkFontHost_tables.cpp',
+          ],
+        }],
+        [ 'toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gdk',
+          ],
+        }, {  # toolkit_uses_gtk == 0
+          'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ],
         }],
         [ 'OS == "mac"', {
           'defines': [
             'SK_BUILD_FOR_MAC',
           ],
           'include_dirs': [
             '../third_party/skia/include/utils/mac',
           ],
           'link_settings': {
             'libraries': [
@@ skipping 203 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }