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 /chrome/test | |
| 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 'chrome/test')
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 6d67674..9132f1b 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -24,20 +24,11 @@ env.SConscript([ '$MODP_B64_DIR/using_modp_b64.scons', '$NET_DIR/using_net.scons', '$NPAPI_DIR/using_npapi.scons', + '$SDCH_DIR/using_sdch.scons', '$SKIA_DIR/using_skia.scons', '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) -if env.Bit('windows'): - env.SConscript([ - '$SDCH_DIR/using_sdch.scons', - ], {'env':env}) - -if env.Bit('posix'): - env.SConscript([ - '$LIBEVENT_DIR/using_libevent.scons', - ], {'env':env}) - env.Prepend( CPPPATH = [ '$CHROME_DIR/app/resources', @@ -48,7 +39,6 @@ env.Prepend( 'common', 'plugin', 'renderer', - 'sdch', 'sqlite', 'util', 'v8_snapshot', @@ -81,7 +71,6 @@ if env.Bit('windows'): 'jscre', 'test_chrome_plugin', 'views', - 'WebCore', # Windows-specific libraries. 'activex_shim', @@ -261,7 +250,6 @@ input_files = ChromeFileList([ '$CHROME_DIR/renderer/render_widget_unittest.cc', '$CHROME_DIR/renderer/user_script_slave_unittest.cc', '$CHROME_DIR/renderer/render_process_unittest.cc', - '$WEBKIT_DIR/glue/mock_webkit_glue.cc', '$CHROME_DIR/renderer/render_thread_unittest.cc', # test_infrastructure |