Chromium Code Reviews| Index: webkit/support/webkit_support.gypi |
| =================================================================== |
| --- webkit/support/webkit_support.gypi (revision 70599) |
| +++ 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', |
| @@ -17,6 +17,7 @@ |
| '<(DEPTH)/testing/gtest.gyp:gtest', |
| 'appcache', |
| 'blob', |
| + 'common', |
| 'database', |
| 'fileapi', |
| 'glue', |
| @@ -47,7 +48,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': 'common', |
|
tony
2011/01/11 17:45:22
Can we name this webkit_support_common to avoid am
tkent
2011/01/12 02:17:15
Yes!
Done in the updated patch.
|
| + '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', |
| @@ -74,22 +101,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', |
| - ], |
| - }], |
| - }], |
| - ], |
| }, |
| ], |
| } |