[content shell] Update dependencies for content shell layout tests from DumpRenderTree to TestRunner_resources
Also add an explicit dependency from content_shell to osmesa BUG=111316 TEST=content_shell --dump-render-tree still works after a clobber build Review URL: https://codereview.chromium.org/11144012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161832 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
@@ -305,6 +305,8 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'content_shell_lib',
|
'content_shell_lib',
|
||||||
'content_shell_pak',
|
'content_shell_pak',
|
||||||
|
'../third_party/mesa/mesa.gyp:osmesa',
|
||||||
|
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'..',
|
'..',
|
||||||
@@ -436,7 +438,6 @@
|
|||||||
'type': 'none',
|
'type': 'none',
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'content_shell',
|
'content_shell',
|
||||||
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@@ -627,9 +627,7 @@
|
|||||||
'../ui/ui.gyp:ui',
|
'../ui/ui.gyp:ui',
|
||||||
'../webkit/support/webkit_support.gyp:clearkeycdmplugin',
|
'../webkit/support/webkit_support.gyp:clearkeycdmplugin',
|
||||||
'../webkit/support/webkit_support.gyp:glue',
|
'../webkit/support/webkit_support.gyp:glue',
|
||||||
# TODO(jochen): Change this to DumpRenderTree_helpers once
|
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
|
||||||
# http://wkb.ug/99023 has landed.
|
|
||||||
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
|
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'..',
|
'..',
|
||||||
|
Reference in New Issue
Block a user