diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 07:00:55 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 07:00:55 +0000 |
| commit | 9fc176de525b470b3e8a698143dcb899ce0bb5c4 (patch) | |
| tree | 6165838b6a135b0d091aeebcbd156f3037e87035 | |
| parent | c06186d9e84ef974d5784414b983b0bb9a343903 (diff) | |
| download | chromium_src-9fc176de525b470b3e8a698143dcb899ce0bb5c4.zip chromium_src-9fc176de525b470b3e8a698143dcb899ce0bb5c4.tar.gz chromium_src-9fc176de525b470b3e8a698143dcb899ce0bb5c4.tar.bz2 | |
Work around a bug in gyp triggered by webkit_appcache.gypi.
The bug seems to be showing up on the chromium build.webkit.org bots
where we're generating two different versions of webkit_appcache.target.mk
and the second one is overwriting the first, but is being considered
to not be "part of all". As a result, DumpRenderTree is no longer being
built by "make all".
TBR=tony@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8667009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111325 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/appcache/webkit_appcache.gypi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index fc35bf7..f61a8c4 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -86,15 +86,19 @@ 'type': 'static_library', }, { 'type': '<(component)', - 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - ], }], ['inside_chromium_build==0', { 'dependencies': [ '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', ], }], + [# TODO(dpranke): Figure out why this doesn't work outside of + # a webkit build - this seems to be a bug in the make gyp generator. + 'OS!="mac" and inside_chromium_build==1', { + 'dependencies': [ + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + ], + }], ], }, ], |