summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-26 01:08:55 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-26 01:08:55 +0000
commit322878d6f906ed5a065e4a9a633a02d508bee942 (patch)
treed8ead606e87ea9ca7491868b00a9d7dd4cde08aa
parent49b538c17bce1295323f41745584192a20874222 (diff)
downloadchromium_src-322878d6f906ed5a065e4a9a633a02d508bee942.zip
chromium_src-322878d6f906ed5a065e4a9a633a02d508bee942.tar.gz
chromium_src-322878d6f906ed5a065e4a9a633a02d508bee942.tar.bz2
Remove a circular dependency within the test_shell SConscript.
Review URL: http://codereview.chromium.org/16266 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7473 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 52d15f6..d6e6bd6 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -32,12 +32,10 @@ env.Append(
'$GTEST_DIR/include',
],
LIBS = [
- 'test_shell',
'glue',
'port',
'base',
'base_gfx',
- 'breakpad_handler',
'googleurl',
'net',
'sdch',
@@ -63,6 +61,7 @@ if env.Bit('windows'):
env.Append(
LIBS = [
'activex_shim',
+ 'breakpad_handler',
'breakpad_sender',
]
)
@@ -135,6 +134,8 @@ elif env.Bit('linux'):
lib = env.ChromeStaticLibrary('test_shell', input_files)
+env.Append(LIBS = ['test_shell'])
+
env.ChromeMSVSProject('$WEBKIT_DIR/tools/test_shell/test_shell.vcproj',
dependencies = [
'$BASE_DIR/build/base.vcproj',