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

in subtle and devious ways.

Renaming webkit.gyp -> webkit_glue.gyp changed webkit.sln to webkit_glue.sln,
which occured unbeknownst to the builders who continued to build webkit.sln
for most of the day. This wasn't an issue until we did a WebKit roll, where
the trickery was discovered and hell broke loose.

TBR=yaar
TEST=green bots
BUG=none

Review URL: http://codereview.chromium.org/385084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31887 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 24 insertions, 24 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 524b26f..f19cc9f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -36,7 +36,7 @@
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
         '../webkit/tools/test_shell/test_shell.gyp:*',
-        '../webkit/webkit_glue.gyp:*',
+        '../webkit/webkit.gyp:*',
         'util/build_util.gyp:*',
         'temp_gyp/googleurl.gyp:*',
       ],
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index 12fd1db..43dae19 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -12,7 +12,7 @@
     'type': 'loadable_module',
     'dependencies': [
       '../../chrome.gyp:chrome_strings',
-      '../../../webkit/webkit_glue.gyp:webkit_strings',
+      '../../../webkit/webkit.gyp:webkit_strings',
       '../../../app/app.gyp:app_strings',
     ],
     'msvs_settings': {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5a4b209..6cf6cb4 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -31,7 +31,7 @@
       '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',
@@ -526,8 +526,8 @@
         '../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': [
         '..',
@@ -793,8 +793,8 @@
         '../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': [
         '..',
@@ -3175,7 +3175,7 @@
         '../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)',
@@ -3227,7 +3227,7 @@
         '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',
@@ -3282,7 +3282,7 @@
         # 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': [
         '..',
@@ -4486,7 +4486,7 @@
         '../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',
@@ -5650,7 +5650,7 @@
                 '../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': [
@@ -6344,7 +6344,7 @@
             '../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',
@@ -6552,7 +6552,7 @@
             '../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:*',
 
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index 1e8cc2b..7f0838c 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -20,7 +20,7 @@
     '<(DEPTH)/testing/gtest.gyp:gtest',
     '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
     # run time dependency
-    '<(DEPTH)/webkit/webkit_glue.gyp:webkit_resources',
+    '<(DEPTH)/webkit/webkit.gyp:webkit_resources',
   ],
   'include_dirs': [
     '<(DEPTH)',
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 280b0c4..061059c 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -17,8 +17,8 @@
             '../../third_party/icu/icu.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/npapi/npapi.gyp:npapi',
-            '../webkit_glue.gyp:webkit_resources',
-            '../webkit_glue.gyp:webkit_strings',
+            '../webkit.gyp:webkit_resources',
+            '../webkit.gyp:webkit_strings',
           ],
           'include_dirs': [
             '../..',
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 878789c..346cd99 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -37,10 +37,10 @@
         '../../../third_party/npapi/npapi.gyp:npapi',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../../webkit_glue.gyp:appcache',
-        '../../webkit_glue.gyp:database',
-        '../../webkit_glue.gyp:glue',
-        '../../webkit_glue.gyp:inspector_resources',
+        '../../webkit.gyp:appcache',
+        '../../webkit.gyp:database',
+        '../../webkit.gyp:glue',
+        '../../webkit.gyp:inspector_resources',
         'npapi_layout_test_plugin',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -119,7 +119,7 @@
         '../../../net/net.gyp:net',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
-        '../../webkit_glue.gyp:glue',
+        '../../webkit.gyp:glue',
       ],
       'conditions': [
         # http://code.google.com/p/chromium/issues/detail?id=18337
@@ -344,8 +344,8 @@
         }, { # OS != "mac"
           'dependencies': [
             '../../../net/net.gyp:net_resources',
-            '../../webkit_glue.gyp:webkit_resources',
-            '../../webkit_glue.gyp:webkit_strings',
+            '../../webkit.gyp:webkit_resources',
+            '../../webkit.gyp:webkit_strings',
           ]
         }],
       ],
diff --git a/webkit/webkit_glue.gyp b/webkit/webkit.gyp
index 972d734..972d734 100644
--- a/webkit/webkit_glue.gyp
+++ b/webkit/webkit.gyp