| Index: webkit/webkit.gyp
|
| diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
|
| index 464ff85149e87aaf621f6fdb04b91ffedd858b60..8805a8c2193b821ed262917a248f287d58f0d93d 100644
|
| --- a/webkit/webkit.gyp
|
| +++ b/webkit/webkit.gyp
|
| @@ -5,7 +5,6 @@
|
| {
|
| 'includes': [
|
| '../build/win_precompile.gypi',
|
| - 'tools/test_shell/test_shell.gypi',
|
| ],
|
| 'variables': {
|
| 'chromium_code': 1,
|
| @@ -25,5 +24,28 @@
|
| '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree'
|
| ],
|
| },
|
| - ], # targets
|
| + {
|
| + 'target_name': 'pull_in_copy_TestNetscapePlugIn',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:copy_TestNetscapePlugIn'
|
| + ],
|
| + },
|
| + ],
|
| + 'conditions': [
|
| + # Currently test_shell compiles only on Windows, Mac, and Gtk.
|
| + ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', {
|
| + 'targets': [
|
| + {
|
| + # TODO(darin): Delete this dummy target once the build masters stop
|
| + # trying to build it.
|
| + 'target_name': 'test_shell',
|
| + 'type': 'static_library',
|
| + 'sources': [
|
| + 'support/test_shell_dummy.cc',
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| + ],
|
| }
|
|
|