Rolling back webkit-gyp switch. r14382

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@14837 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -39,8 +39,6 @@
         '../third_party/npapi/npapi.gyp:*',
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
-        '../webkit/tools/test_shell/test_shell.gyp:*',
-        '../webkit/webkit.gyp:*',
         'temp_gyp/googleurl.gyp:*',
       ],
       'conditions': [
@@ -70,6 +68,8 @@
         ['all_gyps', {
           'dependencies': [
             '../chrome/chrome.gyp:*',
+            '../webkit/tools/test_shell/test_shell.gyp:*',
+            '../webkit/webkit.gyp:*',
           ],
         }],
       ],