diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:40:48 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:40:48 +0000 |
| commit | f7f181f5b4b4cfa8d4882cccb3e349458084dbf6 (patch) | |
| tree | fcb7074b4d754ae1f83fc6d2da42954662cb611f /webkit | |
| parent | 94f957511b1a940454516a43acb730350fc6cad8 (diff) | |
| download | chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.zip chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.tar.gz chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.tar.bz2 | |
Fix our link madness on linux. We now properly link
webkit into unit_tests.
There was also a problem with simple_clipboard_impl.cc which should only be
compiled into test_shell.
I can't remove mock_webkit_glue.cc until I verify that the mac build doesn't
need it anymore.
Review URL: http://codereview.chromium.org/19474
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/SConscript | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 5027c9d..df87873 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -65,7 +65,6 @@ input_files = [ 'resource_fetcher.cc', 'resource_handle_impl.cc', 'searchable_form_data.cc', - 'simple_clipboard_impl.cc', 'stacking_order_iterator.cc', 'webcursor.cc', 'webdatasource_impl.cc', diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 4bdfea9..06d28c7 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -107,6 +107,11 @@ input_files = [ 'event_sending_controller.cc', 'layout_test_controller.cc', 'simple_resource_loader_bridge.cc', + + # This file is only used by test_shell/test_shell_tests. It should + # probably be moved to the test_shell directory like + # simple_resource_loader_bridge.cc. + '$WEBKIT_DIR/glue/simple_clipboard_impl.cc', 'test_navigation_controller.cc', 'test_shell_request_context.cc', 'test_shell_switches.cc', |