Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: webkit/support/webkit_support.gypi

Issue 6111001: Make a separated library for files common between webkit_support and test_she... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
- ],
- }],
- }],
- ],
},
],
}
« no previous file with comments | « no previous file | webkit/tools/test_shell/test_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698