| Index: webkit/support/webkit_support.gypi
|
| ===================================================================
|
| --- webkit/support/webkit_support.gypi (revision 71107)
|
| +++ webkit/support/webkit_support.gypi (working copy)
|
| @@ -9,7 +9,7 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'webkit_support',
|
| - 'type': 'static_library',
|
| + 'type': '<(library)',
|
| 'dependencies': [
|
| '<(DEPTH)/gfx/gfx.gyp:gfx',
|
| '<(DEPTH)/media/media.gyp:media',
|
| @@ -21,6 +21,7 @@
|
| 'fileapi',
|
| 'glue',
|
| 'webkit_gpu',
|
| + 'webkit_support_common',
|
| ],
|
| 'include_dirs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit
|
| @@ -48,7 +49,33 @@
|
| 'weburl_loader_mock.h',
|
| 'weburl_loader_mock_factory.cc',
|
| 'weburl_loader_mock_factory.h',
|
| - # TODO(tkent): Move the following files to here.
|
| + ],
|
| + 'conditions': [
|
| + ['OS=="mac"', {
|
| + 'copies': [{
|
| + 'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
|
| + 'files': ['../tools/test_shell/resources/textAreaResizeCorner.png'],
|
| + }],
|
| + },{ # OS!="mac"
|
| + 'copies': [{
|
| + 'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources',
|
| + 'files': [
|
| + '../tools/test_shell/resources/missingImage.gif',
|
| + '../tools/test_shell/resources/textAreaResizeCorner.png',
|
| + ],
|
| + }],
|
| + }],
|
| + ],
|
| + },
|
| +
|
| + {
|
| + 'target_name': 'webkit_support_common',
|
| + 'type': '<(library)',
|
| + 'dependencies': [
|
| + '<(DEPTH)/skia/skia.gyp:skia',
|
| + 'glue',
|
| + ],
|
| + 'sources': [
|
| '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h',
|
| '<(DEPTH)/webkit/tools/test_shell/mac/DumpRenderTreePasteboard.m',
|
| '<(DEPTH)/webkit/tools/test_shell/mock_webclipboard_impl.cc',
|
| @@ -75,22 +102,6 @@
|
| '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc',
|
| '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h',
|
| ],
|
| - 'conditions': [
|
| - ['OS=="mac"', {
|
| - 'copies': [{
|
| - 'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
|
| - 'files': ['../tools/test_shell/resources/textAreaResizeCorner.png'],
|
| - }],
|
| - },{ # OS!="mac"
|
| - 'copies': [{
|
| - 'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources',
|
| - 'files': [
|
| - '../tools/test_shell/resources/missingImage.gif',
|
| - '../tools/test_shell/resources/textAreaResizeCorner.png',
|
| - ],
|
| - }],
|
| - }],
|
| - ],
|
| },
|
| ],
|
| }
|
|
|