summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 08:02:56 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 08:02:56 +0000
commit5826e88badd9ca566496dd7fba1f479c30a70a7f (patch)
tree1c3e2ae69957f513cff4a229e947b841eb7006be /build
parent27f4aaa2d497432dfaab6e339aef75ea41670a9d (diff)
downloadchromium_src-5826e88badd9ca566496dd7fba1f479c30a70a7f.zip
chromium_src-5826e88badd9ca566496dd7fba1f479c30a70a7f.tar.gz
chromium_src-5826e88badd9ca566496dd7fba1f479c30a70a7f.tar.bz2
Switching webkit over to gyp on windows.
Review URL: http://codereview.chromium.org/99173 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14832 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 1c79811..99e8cd2 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -39,6 +39,8 @@
'../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': [
@@ -68,8 +70,6 @@
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
- '../webkit/tools/test_shell/test_shell.gyp:*',
- '../webkit/webkit.gyp:*',
],
}],
],