diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 04:25:50 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 04:25:50 +0000 |
| commit | 87d04b504db97964b2009da1e41758058be3da78 (patch) | |
| tree | a5960995df2583d2d9655090ee2efa56109924ce /webkit/support | |
| parent | 09b13b8b62d62e47da1021b09e929d626283c447 (diff) | |
| download | chromium_src-87d04b504db97964b2009da1e41758058be3da78.zip chromium_src-87d04b504db97964b2009da1e41758058be3da78.tar.gz chromium_src-87d04b504db97964b2009da1e41758058be3da78.tar.bz2 | |
Make a separated library for files common between webkit_support and test_shell
in order to avoid that test_shell links webkit_support-dedicated files.
BUG=67457
TEST=none; No behavior change.
Review URL: http://codereview.chromium.org/6111001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.gypi | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index 2d7300f..5e177ea 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -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', - ], - }], - }], - ], }, ], } |