Upstreaming WebKit.gyp

webkit/tools/test_shell/test_shell.gyp

Index: webkit/tools/test_shell/test_shell.gyp
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 3d16f492713e72f93b26f6e6f2676029657d87ab..44a6ecb8efe01144b643a65986f3c87c09e7ceba 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -36,11 +36,11 @@
         '../../../testing/gtest.gyp:gtest',
         '../../../third_party/npapi/npapi.gyp:npapi',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        '../../webkit.gyp:appcache',
-        '../../webkit.gyp:database',
-        '../../webkit.gyp:glue',
-        '../../api/WebKit.gyp:webkit',
-        '../../webkit.gyp:inspector_resources',
+        '../../../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',
         'npapi_layout_test_plugin',
       ],
       'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -118,8 +118,8 @@
         '../../../base/base.gyp:base',
         '../../../net/net.gyp:net',
         '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        '../../webkit.gyp:glue',
-        '../../api/WebKit.gyp:webkit',
+        '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
+        '../../webkit_glue.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.gyp:webkit_resources',
-            '../../webkit.gyp:webkit_strings',
+            '../../webkit_glue.gyp:webkit_resources',
+            '../../webkit_glue.gyp:webkit_strings',
           ]
         }],
       ],