Cross-platform: Let SCons abstract library names by getting rid of .lib suffixes when linking with the libraries we build, replacing the lists of explicitly-suffixed "source files" with library base names in the environment LIBS variables. This requires having ChromeStaticLibrary() install .lib files in a $BUILD_TYPE/Libs directory, and adding that directory to $LIBPATH.

R=evanm,bradnelson



git-svn-id: svn://svn.chromium.org/chrome/trunk/src@326 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 320 insertions, 267 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 618d6d5..7e78c5e 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -114,6 +114,34 @@ env_dll.Append(
         '$BREAKPAD_DIR/src',

     ],

     LIBS = [

+        'base',

+        'base_gfx',

+        'breakpad_handler',

+        'googleurl',

+        'net',

+        'skia',

+        'bzip2',

+        'icuuc',

+        'libjpeg',

+        'libpng',

+        'libxml',

+        'libxslt',

+        'modp_b64',

+        'zlib',

+

+        'activex_shim',

+        'WTF',

+        'V8Bindings',

+        'WebCore',

+        'default_plugin',

+        'Glue',

+        'JavaScriptCore_pcre',

+        'Port',

+    ],

+)

+

+env_dll.Append(

+    LIBS = [

         'comctl32.lib',

         'dwmapi.lib',

         'rpcrt4.lib',

@@ -161,11 +189,7 @@ input_files = [
     'app/chrome_dll_main.cc',

 ]

 

-

 libs = [

-    '$BASE_DIR/base.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$BREAKPAD_DIR/breakpad_handler.lib',

     'browser/browser.lib',

     'browser/debugger/debugger.lib',

     'common/common.lib',

@@ -176,27 +200,8 @@ libs = [
     'third_party/hunspell/hunspell.lib',

     'third_party/sqlite/sqlite.lib',

     'views/views.lib',

-    '$NET_DIR/net.lib',

-    '$SKIA_DIR/skia.lib',

-    '$BZIP2_DIR/bzip2.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$LIBJPEG_DIR/libjpeg.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$LIBXML_DIR/libxml.lib',

-    '$LIBXSLT_DIR/libxslt.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$ZLIB_DIR/zlib.lib',

     '$V8_DIR/v8.lib',

     '$V8_DIR/snapshot-empty.obj',

-    '$WEBKIT_DIR/activex_shim/activex_shim.lib',

-    '$WEBKIT_DIR/build/JavaScriptCore/WTF.lib',

-    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.lib',

-    '$WEBKIT_DIR/build/WebCore/WebCore.lib',

-    '$WEBKIT_DIR/default_plugin/default_plugin.lib',

-    '$WEBKIT_DIR/glue/Glue.lib',

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$WEBKIT_DIR/JavaScriptCore_pcre.lib',

-    '$WEBKIT_DIR/Port.lib',

 ]

 

 dll_targets = env_dll.ChromeSharedLibrary(['chrome',

@@ -248,22 +253,6 @@ chrome_dll_version_rc = env.ChromeVersionRC(
     'app/chrome_dll_version.rc.version',

 )

 

-

-#chrome_exe_version_rc = env_version.Command(

-#    'chrome_exe_version.rc',

-#    ['app/chrome_exe_version.rc.version',

-#     '$CHROME_SRC_DIR/VERSION',

-#     '$CHROME_SRC_DIR/BRANDING'],

-#    '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET')

-#

-#chrome_dll_version_rc = env_version.Command(

-#    'chrome_dll_version.rc',

-#    ['app/chrome_dll_version.rc.version',

-#     '$CHROME_SRC_DIR/VERSION',

-#     '$CHROME_SRC_DIR/BRANDING',

-#    ],

-#    '$VERSION_BAT $SOURCE $CHROME_SRC_DIR $PWD $TARGET')

-

 Depends(chrome_dll_res, chrome_dll_version_rc)

 

 chrome_exe_version_res = env_res.RES(chrome_exe_version_rc)

@@ -278,12 +267,20 @@ install_targets.extend(chrome_dll_version_res)
 

 

 env_exe = env.Clone()

+

 env_exe.Prepend(

     CPPPATH = [

         '..',

         '$BREAKPAD_DIR/src',

     ],

+    LIBS = [

+        'breakpad_handler',

+        'sandbox',

+        'base',

+        'icuuc',

+    ],

 )

+

 env_exe.Append(

     LINKFLAGS = [

         '/INCREMENTAL',

@@ -318,10 +315,6 @@ chrome_exe = env_exe.ChromeProgram(
 

         'common/common.lib',

         '$CHROME_DIR/chrome_dll.lib',

-        '$BREAKPAD_DIR/breakpad_handler.lib',

-        '$SANDBOX_DIR/src/sandbox.lib',

-        '$BASE_DIR/base.lib',

-        '$ICU38_DIR/icuuc.lib',

     ]

 )

 

diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index 2da84e8..96e4039 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -48,6 +48,20 @@ env_test.Prepend(
     CPPDEFINES = [

         'LIBXML_STATIC',

     ],

+    LIBS = [

+        'libxml',

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'zlib',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -74,17 +88,8 @@ env_test.Prepend(
 )

 

 libs = [

-    '$LIBXML_DIR/libxml.lib',

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

     'common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

     'browser/browser.lib',

-    '$BASE_DIR/base.lib',

     'test/automation/automation.lib',

 ]

 

diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 5821d5a..dc98e98 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -55,6 +55,25 @@ env_test.Prepend(
         'UI_TEST',

         'UNIT_TEST',

     ],

+    LIBS = [

+        'libxml',

+        'googleurl',

+        'skia',

+        'libpng',

+        'npapi_layout_test_plugin',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'zlib',

+        'modp_b64',

+        'net',

+        'bzip2',

+        'base',

+        'npapi_test_plugin',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -81,24 +100,10 @@ env_test.Prepend(
 )

 

 libs = [

-    '$LIBXML_DIR/libxml.lib',

-    '$GOOGLEURL_DIR/googleurl.lib',

     'test/security_tests/security_tests.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TARGET_ROOT/plugins/npapi_layout_test_plugin.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

     'common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

     'browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BZIP2_DIR/bzip2.lib',

-    '$BASE_DIR/base.lib',

     'test/automation/automation.lib',

-    '$TARGET_ROOT/npapi_test_plugin.lib',

 ]

 

 ui_test_files = [

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index cfd3ff5..09d51c1 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -55,6 +55,35 @@ env_test.Prepend(
         'CHROME_PNG_WRITE_SUPPORT',

         'UNIT_TEST',

     ],

+    LIBS = [

+        'base',

+        'base_gfx',

+        'bzip2',

+        'googleurl',

+        'gtest',

+        'icuuc',

+        'libjpeg',

+        'libpng',

+        'libxml',

+        'libxslt',

+        'modp_b64',

+        'net',

+        'skia',

+        'v8',

+        'zlib',

+

+        'activex_shim',

+        'WTF',

+        'V8Bindings',

+        'WebCore',

+        'default_plugin',

+        'Glue',

+        'JavaScriptCore_pcre',

+        'Port',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -94,30 +123,6 @@ libs = [
     'third_party/hunspell/hunspell.lib',

     'third_party/sqlite/sqlite.lib',

     'views/views.lib',

-

-    '$BASE_DIR/base.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$BZIP2_DIR/bzip2.lib',

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$LIBJPEG_DIR/libjpeg.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$LIBXML_DIR/libxml.lib',

-    '$LIBXSLT_DIR/libxslt.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$NET_DIR/net.lib',

-    '$SKIA_DIR/skia.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$WEBKIT_DIR/activex_shim/activex_shim.lib',

-    '$WEBKIT_DIR/build/JavaScriptCore/WTF.lib',

-    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.lib',

-    '$WEBKIT_DIR/build/WebCore/WebCore.lib',

-    '$WEBKIT_DIR/default_plugin/default_plugin.lib',

-    '$WEBKIT_DIR/glue/Glue.lib',

-    '$WEBKIT_DIR/JavaScriptCore_pcre.lib',

-    '$WEBKIT_DIR/port.lib',

-    '$V8_DIR/v8.lib',

-    '$ZLIB_DIR/zlib.lib',

 ]

 

 unit_test_files = [

diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index 9235323..e6065ff 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -143,6 +143,14 @@ env_test.Append(
         '#/..',

         '$GTEST_DIR/include',

     ],

+    LIBS = [

+        'base',

+        'gtest',

+        'icuuc',

+    ],

+)

+

+env_test.Append(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -172,10 +180,7 @@ ipc_tests_files = [
 ]

 

 libs = [

-    '$TESTING_DIR/gtest.lib',

-    '$ICU38_DIR/icuuc.lib',

     'common.lib',

-    '$BASE_DIR/base.lib',

 ]

 

 ipc_tests = env_test.ChromeTestProgram('ipc_tests.exe', ipc_tests_files + libs)

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 1cc3232..64b770d 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -130,6 +130,15 @@ env_test.Prepend(
         '$GTEST_DIR',

         '#/..',

     ],

+    LIBS = [

+        'gtest',

+        'icuuc',

+        'common',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -168,10 +177,6 @@ input_files = [
 

 libs = [

     '../util/util.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$BASE_DIR/base.lib',

 ]

 

 exe = env_test.ChromeTestProgram(['installer_unittests',

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index f4b2048..3f71843 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -58,6 +58,16 @@ env.Prepend(
         '.',

         '#/..',

     ],

+    LIBS = [

+        'bspatch',

+        'lzma_sdk',

+        'icuuc',

+        'common',

+        'base',

+    ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -94,11 +104,6 @@ input_files = [
 

 libs = [

     '../util/util.lib',

-    '$BSPATCH_DIR/bspatch.lib',

-    '$LZMA_SDK_DIR/lzma_sdk.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$BASE_DIR/base.lib',

 ]

 

 exe = env.ChromeProgram(['setup',

diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index b4d95e1..dbec5a0 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -36,6 +36,14 @@ env.Prepend(
     CPPPATH = [

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'icuuc',

+        'base',

+    ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -62,13 +70,7 @@ input_files = [
     'test_chrome_plugin.def',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$BASE_DIR/base.lib',

-]

-

-dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files + libs)

+dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files)

 

 i = env.Install('$TARGET_ROOT', dll)

 env.Alias('chrome', i)

diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index d472554..5262af5 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -50,6 +50,25 @@ env_test.Prepend(
         '$LIBXSLT_DIR',

         '$LIBXML_DIR/include',

     ],

+    LIBS = [

+        'automation',

+        'base',

+        'base_gfx',

+        'browser',

+        'bzip2',

+        'common',

+        'googleurl',

+        'gtest',

+        'icuuc',

+        'libpng',

+        'modp_b64',

+        'net',

+        'skia',

+        'zlib',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -83,27 +102,9 @@ input_files = [
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BZIP2_DIR/bzip2.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['interactive_ui_tests',

                         'interactive_ui_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index af327a8..0aa72c3 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -42,6 +42,15 @@ env_test.Prepend(
         '$GTEST_DIR',

         '#/..',

     ],

+    LIBS = [

+        'util',

+        'gtest',

+        'icuuc',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -73,16 +82,9 @@ input_files = [
     'test.cc',

 ]

 

-libs = [

-    '$CHROME_DIR/installer/util/util.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$BASE_DIR/base.lib',

-]

-

 exe = env_test.ChromeTestProgram(['mini_installer_test',

                         'mini_installer_test.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index cf220199..86fbdbf 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -45,6 +45,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -79,26 +97,9 @@ input_files = [
     'page_cycler_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['page_cycler_tests',

                         'page_cycler_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 78ecbb0..5cd5202 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -49,6 +49,25 @@ env_test.Prepend(
         '$LIBXSLT_DIR',

         '$LIBXML_DIR/includ',

     ],

+    LIBS = [

+        'googleurl',

+        'security_tests',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -81,27 +100,10 @@ input_files = [
     'plugin_test.cpp',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$CHROME_DIR/test/security_tests/security_tests.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 

 exe = env_test.ChromeTestProgram(['plugin_tests',

                         'plugin_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 3c0cbf5..0963288 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -46,6 +46,22 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'browser',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -79,24 +95,9 @@ input_files = [
     'run_all_unittests.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

-

 exe = env_test.ChromeTestProgram(['reliability_tests',

                         'reliability_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index 2caf4d8..27a3eed 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -36,6 +36,9 @@ env.Prepend(
     CPPPATH = [

         '#/..',

     ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -63,7 +66,14 @@ input_files = [
     '$SANDBOX_DIR/tests/validation_tests/commands${OBJSUFFIX}',

 ]

 

-dll = env.ChromeSharedLibrary('security_tests', input_files)

+dll = env.ChromeSharedLibrary(['security_tests',

+                               'security_tests.lib',

+                               'security_tests.ilk',

+                               'security_tests.pdb'],

+                              input_files)

+

+# TODO(sgk):  can go away once ChromeSharedLibrary() handles this.

+env.Install('$LIBS_DIR', dll[1])

 

 i = env.Install('$TARGET_ROOT', dll)

 env.Alias('chrome', i)

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index 25cc7c2..c00c570 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -44,6 +44,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -75,25 +93,9 @@ input_files = [
     'selenium_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 exe = env_test.ChromeTestProgram(['selenium_tests',

                         'selenium_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 744014b..7815551 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -44,6 +44,22 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'browser',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -76,23 +92,9 @@ input_files = [
     'startup_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 exe = env_test.ChromeTestProgram(['startup_tests',

                         'startup_tests.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index 034edce..420583f 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -44,6 +44,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',

         '#/..',

     ],

+    LIBS = [

+        'googleurl',

+        'skia',

+        'libpng',

+        'gtest',

+        'base_gfx',

+        'icuuc',

+        'common',

+        'zlib',

+        'modp_b64',

+        'browser',

+        'net',

+        'base',

+        'automation',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -76,27 +94,11 @@ input_files = [
     'tab_switching_test.cc',

 ]

 

-libs = [

-    '$GOOGLEURL_DIR/googleurl.lib',

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$TESTING_DIR/gtest.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$MODP_B64_DIR/modp_b64.lib',

-    '$CHROME_DIR/browser/browser.lib',

-    '$NET_DIR/net.lib',

-    '$BASE_DIR/base.lib',

-    '$CHROME_DIR/test/automation/automation.lib',

-]

-

 #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"

 

 exe = env_test.ChromeTestProgram(['tab_switching_test',

                         'tab_switching_test.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript
index 1227b11..260f7bf 100644
--- a/chrome/tools/crash_service/SConscript
+++ b/chrome/tools/crash_service/SConscript
@@ -36,6 +36,19 @@ env.Prepend(
         '$BREAKPAD_DIR/src',

         '#/..',

     ],

+    LIBS = [

+        'base',

+        'base_gfx',

+        'breakpad_handler',

+        'breakpad_sender',

+        'common',

+        'icuuc',

+        'skia',

+        'zlib',

+    ],

+)

+

+env.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

 

@@ -54,24 +67,12 @@ env.Prepend(
     ],

 )

 

-libs = [

-    '$BASE_DIR/base.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$BREAKPAD_DIR/breakpad_handler.lib',

-    '$BREAKPAD_DIR/breakpad_sender.lib',

-    '$CHROME_DIR/common/common.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$SKIA_DIR/skia.lib',

-    '$ZLIB_DIR/zlib.lib',

-]

-

-

 input_files = [

     'main.cc',

     'crash_service.cc',

 ]

 

-exe = env.ChromeProgram('crash_service.exe', input_files + libs)

+exe = env.ChromeProgram('crash_service.exe', input_files)

 

 i = env.Install('$TARGET_ROOT', exe)

 Alias('chrome', i)

diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index 349375b..0173e16 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -35,6 +35,13 @@ env_test.Prepend(
     CPPPATH = [

         '#/..',

     ],

+    LIBS = [

+        'icuuc',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -57,14 +64,9 @@ input_files = [
     'flush_cache.cc',

 ]

 

-libs = [

-    '$ICU38_DIR/icuuc.lib',

-    '$BASE_DIR/base.lib',

-]

-

 exe = env_test.ChromeTestProgram(['flush_cache',

                         'flush_cache'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)

diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 6511ba9..01d293b 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -42,6 +42,17 @@ env_test.Prepend(
         '$LIBPNG_DIR',

         '#/..',

     ],

+    LIBS = [

+        'skia',

+        'libpng',

+        'base_gfx',

+        'icuuc',

+        'zlib',

+        'base',

+    ],

+)

+

+env_test.Prepend(

     LINKFLAGS = [

         '/INCREMENTAL',

         '/DEBUG',

@@ -65,18 +76,9 @@ input_files = [
     'image_diff.cc',

 ]

 

-libs = [

-    '$SKIA_DIR/skia.lib',

-    '$LIBPNG_DIR/libpng.lib',

-    '$BASE_DIR/gfx/base_gfx.lib',

-    '$ICU38_DIR/icuuc.lib',

-    '$ZLIB_DIR/zlib.lib',

-    '$BASE_DIR/base.lib',

-]

-

 exe = env_test.ChromeTestProgram(['image_diff',

                         'image_diff.pdb'],

-                       input_files + libs)

+                       input_files)

 i = env_test.Install('$TARGET_ROOT', exe)

 

 env_test.Alias('chrome', i)