Commit 9fc176de authored by dpranke@chromium.org's avatar dpranke@chromium.org

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
parent c06186d9
...@@ -86,15 +86,19 @@ ...@@ -86,15 +86,19 @@
'type': 'static_library', 'type': 'static_library',
}, { }, {
'type': '<(component)', 'type': '<(component)',
'dependencies': [
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
],
}], }],
['inside_chromium_build==0', { ['inside_chromium_build==0', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', '<(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',
],
}],
], ],
}, },
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment