Partially revert WebKit.gyp switch-over, because it broke build bot setup...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 13 matching lines @@
     'chromium_dependencies': [
       'common',
       'browser',
       'debugger',
       'renderer',
       'syncapi',
       'utility',
       'profile_import',
       'worker',
       '../printing/printing.gyp:printing',
-      '../webkit/webkit_glue.gyp:inspector_resources',
+      '../webkit/webkit.gyp:inspector_resources',
     ],
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'chrome_strings_grds': [
       # Localizable resources.
       'app/resources/locale_settings.grd',
       'app/chromium_strings.grd',
       'app/generated_resources.grd',
       'app/google_chrome_strings.grd',
     ],
@@ skipping 474 matching lines @@
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit_glue.gyp:appcache',
-        '../webkit/webkit_glue.gyp:glue',
+        '../webkit/webkit.gyp:appcache',
+        '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # All .cc, .h, and .mm files under chrome/common except for tests.
         'common/desktop_notifications/active_notification_tracker.h',
         'common/desktop_notifications/active_notification_tracker.cc',
         'common/extensions/extension.cc',
         'common/extensions/extension.h',
@@ skipping 245 matching lines @@
         '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit_glue.gyp:database',
-        '../webkit/webkit_glue.gyp:glue',
+        '../webkit/webkit.gyp:database',
+        '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
       ],
       'defines': [
         '<@(nacl_defines)',
       ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser except for tests and
@@ skipping 2360 matching lines @@
         'common',
         'chrome_resources',
         'chrome_strings',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
-        '../webkit/webkit_glue.gyp:glue',
+        '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'sources': [
         # All .cc, .h, .m, and .mm files under plugins except for tests and
         # mocks.
         'plugin/chrome_plugin_host.cc',
         'plugin/chrome_plugin_host.h',
         'plugin/npobject_proxy.cc',
@@ skipping 31 matching lines @@
     },
     {
       'target_name': 'nacl',
       'type': '<(library)',
       'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
       'dependencies': [
         'common',
         'chrome_resources',
         'chrome_strings',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/webkit_glue.gyp:glue',
+        '../webkit/webkit.gyp:glue',
         '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome',
         '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
         '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate',
         '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'defines': [
         'NACL_BLOCK_SHIFT=5',
@@ skipping 34 matching lines @@
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         # TODO(yaar): Should only stop depending on webcore and depend 
         # only on webkit.
         '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../webkit/webkit_glue.gyp:glue',
+        '../webkit/webkit.gyp:glue',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         '<@(nacl_defines)',
       ],
       'sources': [
         # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
         # But app/ is the wrong directory for them.
@@ skipping 1183 matching lines @@
         'renderer',
         'syncapi',
         'test_support_unit',
         'utility',
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_resources',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
-        '../webkit/webkit_glue.gyp:webkit_resources',
+        '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
@@ skipping 1143 matching lines @@
                 # up actual Chromium functionality into this .dll.
                 'chrome_dll_version',
                 'chrome_resources',
                 'installer/installer.gyp:installer_util_strings',
                 'worker',
                 '../printing/printing.gyp:printing',
                 '../net/net.gyp:net_resources',
                 '../build/util/support/support.gyp:*',
                 '../third_party/cld/cld.gyp:cld',
                 '../views/views.gyp:views',
-                '../webkit/webkit_glue.gyp:webkit_resources',
+                '../webkit/webkit.gyp:webkit_resources',
                 '../gears/gears.gyp:gears',
               ],
               'defines': [
                 'CHROME_DLL',
                 'BROWSER_DLL',
                 'RENDERER_DLL',
                 'PLUGIN_DLL',
               ],
               'sources': [
                 'app/chrome_dll.rc',
@@ skipping 673 matching lines @@
             'renderer',
             'syncapi',
             'chrome_resources',
             'chrome_strings',
             '../app/app.gyp:app_base',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../webkit/webkit_glue.gyp:glue',
+            '../webkit/webkit.gyp:glue',
           ],
           'sources': [
             'browser/safe_browsing/database_perftest.cc',
             'browser/safe_browsing/filter_false_positive_perftest.cc',
             'browser/visitedlink_perftest.cc',
             'common/json_value_serializer_perftest.cc',
             'test/perf/perftests.cc',
             'test/perf/url_parse_perftest.cc',
           ],
           'conditions': [
@@ skipping 187 matching lines @@
             '../third_party/libpng/libpng.gyp:*',
             '../third_party/libxml/libxml.gyp:*',
             '../third_party/libxslt/libxslt.gyp:*',
             '../third_party/lzma_sdk/lzma_sdk.gyp:*',
             '../third_party/modp_b64/modp_b64.gyp:*',
             '../third_party/npapi/npapi.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
             '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
             '../webkit/tools/test_shell/test_shell.gyp:*',
-            '../webkit/webkit_glue.gyp:*',
+            '../webkit/webkit.gyp:*',
 
             '../build/temp_gyp/googleurl.gyp:*',
 
             '../breakpad/breakpad.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
             '../v8/tools/gyp/v8.gyp:v8_shell',
@@ skipping 502 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: