diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 05:00:13 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 05:00:13 +0000 |
| commit | 9b2f47c559cdd1b6d0108c393e6a4b774181c1d1 (patch) | |
| tree | 6dcba5f7f1179e27ab0e96cc491b39f6831257b9 /webkit | |
| parent | 3701eb650011bdcca54578b2b755f1da94f21132 (diff) | |
| download | chromium_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 'webkit')
| -rw-r--r-- | webkit/default_plugin/default_plugin.gyp | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 14 | ||||
| -rw-r--r-- | webkit/webkit.gyp (renamed from webkit/webkit_glue.gyp) | 0 |
3 files changed, 9 insertions, 9 deletions
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index 280b0c4..061059c 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -17,8 +17,8 @@ '../../third_party/icu/icu.gyp:icuuc', '../../third_party/libxml/libxml.gyp:libxml', '../../third_party/npapi/npapi.gyp:npapi', - '../webkit_glue.gyp:webkit_resources', - '../webkit_glue.gyp:webkit_strings', + '../webkit.gyp:webkit_resources', + '../webkit.gyp:webkit_strings', ], 'include_dirs': [ '../..', diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 878789c..346cd99 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -37,10 +37,10 @@ '../../../third_party/npapi/npapi.gyp:npapi', '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', '../../../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', + '../../webkit.gyp:appcache', + '../../webkit.gyp:database', + '../../webkit.gyp:glue', + '../../webkit.gyp:inspector_resources', 'npapi_layout_test_plugin', ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', @@ -119,7 +119,7 @@ '../../../net/net.gyp:net', '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', - '../../webkit_glue.gyp:glue', + '../../webkit.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_glue.gyp:webkit_resources', - '../../webkit_glue.gyp:webkit_strings', + '../../webkit.gyp:webkit_resources', + '../../webkit.gyp:webkit_strings', ] }], ], diff --git a/webkit/webkit_glue.gyp b/webkit/webkit.gyp index 972d734..972d734 100644 --- a/webkit/webkit_glue.gyp +++ b/webkit/webkit.gyp |