summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 05:00:13 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 05:00:13 +0000
commit9b2f47c559cdd1b6d0108c393e6a4b774181c1d1 (patch)
tree6dcba5f7f1179e27ab0e96cc491b39f6831257b9 /build
parent3701eb650011bdcca54578b2b755f1da94f21132 (diff)
downloadchromium_src-9b2f47c559cdd1b6d0108c393e6a4b774181c1d1.zip
chromium_src-9b2f47c559cdd1b6d0108c393e6a4b774181c1d1.tar.gz
chromium_src-9b2f47c559cdd1b6d0108c393e6a4b774181c1d1.tar.bz2
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
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp2
1 files changed, 1 insertions, 1 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:*',
],