summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 00:25:00 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 00:25:00 +0000
commit3a60cd2f90780cb2b566f7809b72c13d95652397 (patch)
treeeff88bc8f4b577f3bb2a9c90a9a3c77f9f89ddca /build
parent7c5a45e2001ee5cc9be3c6f0bd3d5e167224f8b4 (diff)
downloadchromium_src-3a60cd2f90780cb2b566f7809b72c13d95652397.zip
chromium_src-3a60cd2f90780cb2b566f7809b72c13d95652397.tar.gz
chromium_src-3a60cd2f90780cb2b566f7809b72c13d95652397.tar.bz2
Rolling back change 13480 (change to gyp for webkit on windows).
Too many loose ends. Review URL: http://codereview.chromium.org/66020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 9a955b6..feec2e3 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -38,8 +38,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:*',
'temp_gyp/v8.gyp:*',
],
@@ -65,6 +63,8 @@
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
+ '../webkit/tools/test_shell/test_shell.gyp:*',
+ '../webkit/webkit.gyp:*',
],
}],
],