Pull the block of common Windows system libraries that we link with everywhere into the base Windows environment.

TBR: evanm,bradnelson

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

33 files changed, 74 insertions, 700 deletions

diff --git a/base/SConscript b/base/SConscript
index 424d98d..4fe2926 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -153,27 +153,6 @@ env_tests.Prepend(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'advapi32.lib',

-        'comdlg32.lib',

-        'DelayImp.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-    ],

 )

 

 libs = [

diff --git a/build/SConscript.main b/build/SConscript.main
index 9bd5c89b..2ffebed 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -200,6 +200,29 @@ if env['PLATFORM'] == 'win32':
         '$VISUAL_STUDIO/VC/atlmfc/lib',
     ],
 
+    LIBS = [
+        'advapi32.lib',
+        'comdlg32.lib',
+        'gdi32.lib',
+        'kernel32.lib',
+        'msimg32.lib',
+        'odbc32.lib',
+        'odbccp32.lib',
+        'ole32.lib',
+        'oleaut32.lib',
+        'psapi.lib',
+        'shell32.lib',
+        'user32.lib',
+        'usp10.lib',
+        'uuid.lib',
+        'version.lib',
+        'wininet.lib',
+        'winspool.lib',
+        'ws2_32.lib',
+
+        'DelayImp.lib',
+    ],
+
     LINKFLAGS = [
         '/nologo',
         '/DEBUG',
diff --git a/build/SConscript.main.linux b/build/SConscript.main.linux
index 373ce85..d092854 100644
--- a/build/SConscript.main.linux
+++ b/build/SConscript.main.linux
@@ -198,6 +198,29 @@ if env['PLATFORM'] == 'win32':
         '$VISUAL_STUDIO/VC/atlmfc/lib',
     ],
 
+    LIBS = [
+        'advapi32.lib',
+        'comdlg32.lib',
+        'gdi32.lib',
+        'kernel32.lib',
+        'msimg32.lib',
+        'odbc32.lib',
+        'odbccp32.lib',
+        'ole32.lib',
+        'oleaut32.lib',
+        'psapi.lib',
+        'shell32.lib',
+        'user32.lib',
+        'usp10.lib',
+        'uuid.lib',
+        'version.lib',
+        'wininet.lib',
+        'winspool.lib',
+        'ws2_32.lib',
+
+        'DelayImp.lib',
+    ],
+
     LINKFLAGS = [
         '/nologo',
         '/DEBUG',
diff --git a/chrome/SConscript b/chrome/SConscript
index 8ea3c3b..618d6d5 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -114,31 +114,11 @@ env_dll.Append(
         '$BREAKPAD_DIR/src',

     ],

     LIBS = [

-        'DelayImp.lib',

-        'advapi32.lib',

         'comctl32.lib',

-        'comdlg32.lib',

-        'delayimp.lib',

         'dwmapi.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

         'rpcrt4.lib',

-        'shell32.lib',

         'shlwapi.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

         'winmm.lib',

-        'winspool.lib',

-        'ws2_32.lib',

         'wsock32.lib',

     ],

     LINKFLAGS = [

@@ -323,27 +303,6 @@ env_exe.Append(
         '/PDB:${TARGETS[1]}',

         '/IMPLIB:${TARGETS[2]}',

     ],

-    LIBS = [

-        'DelayImp.lib',

-        'advapi32.lib',

-        'comdlg32.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-    ],

 )

 

 chrome_exe = env_exe.ChromeProgram(

diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests
index f9730d0..2da84e8 100644
--- a/chrome/SConscript.automated_ui_tests
+++ b/chrome/SConscript.automated_ui_tests
@@ -66,32 +66,10 @@ env_test.Prepend(
         '/FIXED:No',

     ],

     LIBS = [

-        'psapi.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-        '',

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

+        'oleacc.lib',

         'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

-

+        'rpcrt4.lib',

     ],

 )

 

diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 7951b0b..5821d5a 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -73,31 +73,10 @@ env_test.Prepend(
         '/FIXED:No',

     ],

     LIBS = [

-        'winmm.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

+        'oleacc.lib',

+        'rpcrt4.lib',

+        'winmm.lib',

     ],

 )

 

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index 05ba475..cfd3ff5 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -77,27 +77,6 @@ env_test.Prepend(
         'rpcrt4.lib',

         'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript
index 11d9f63..05d2efa2 100644
--- a/chrome/app/resources/SConscript
+++ b/chrome/app/resources/SConscript
@@ -109,27 +109,6 @@ env.Append(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'DelayImp.lib',

-        'advapi32.lib',

-        'comdlg32.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-    ],

     PDB = '${TARGET}.pdb',

     no_import_lib = True,       # We don't need the .lib and .exp.

 )

diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
index 0e3de809..5f87245 100644
--- a/chrome/app/theme/SConscript
+++ b/chrome/app/theme/SConscript
@@ -62,27 +62,6 @@ env.Append(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'DelayImp.lib',

-    ],

 )

 

 themes_default = env.ChromeSharedLibrary("$CHROME_DIR/themes/default", res)

diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index 8505f98..9235323 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -159,29 +159,9 @@ env_test.Append(
         '/FIXED:No',

     ],

     LIBS = [

-        'shlwapi.lib',

         'rpcrt4.lib',

+        'shlwapi.lib',

         'winmm.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index d3e73b5..1abaa14 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -31,6 +31,9 @@ Import('env', 'env_res', 'env_test')
 

 

 env = env.Clone()

+

+env['LIBS'].remove('DelayImp.lib')

+

 env_res = env_res.Clone()

 env_test = env_test.Clone()

 

@@ -76,34 +79,13 @@ env.Prepend(
         '/PDB:${TARGETS[1]}',

         '/MAP:${TARGETS[2]}',

     ],

-)

-

-env['CCFLAGS'].remove('/RTC1')

-

-env.Append(

     LIBS = [

         'shlwapi.lib',

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

     ],

 )

 

+env['CCFLAGS'].remove('/RTC1')

+

 components = [

     "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",

     "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index 0914a99..f4b2048 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -80,29 +80,7 @@ env.Prepend(
     ],

     LIBS = [

         'shlwapi.lib',

-

         'msi.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/test/activex_test_control/SConscript b/chrome/test/activex_test_control/SConscript
index 46e12b3..99c7950 100644
--- a/chrome/test/activex_test_control/SConscript
+++ b/chrome/test/activex_test_control/SConscript
@@ -54,27 +54,7 @@ env.Prepend(
         '/DEBUG',

     ],

     LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

         'comsuppw.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index d95bf07..b4d95e1 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -54,27 +54,6 @@ env.Prepend(
     ],

     LIBS = [

         'winmm.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index efb7cb18..d472554 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -66,32 +66,11 @@ env_test.Prepend(
         '/nxcompat',

     ],

     LIBS = [

-        'winmm.lib',

-        'psapi.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

+        'oleacc.lib',

         'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

+        'rpcrt4.lib',

+        'winmm.lib',

     ],

 )

 

diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index 3b06470..af327a8 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -58,31 +58,10 @@ env_test.Prepend(
         '/nxcompat',

     ],

     LIBS = [

-        'shlwapi.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

+        'oleacc.lib',

+        'rpcrt4.lib',

+        'shlwapi.lib',

     ],

 )

 

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index 1f22faa..cf220199 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -61,32 +61,11 @@ env_test.Prepend(
         '/nxcompat',

     ],

     LIBS = [

-        'winmm.lib',

-        'psapi.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

+        'oleacc.lib',

         'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

+        'rpcrt4.lib',

+        'winmm.lib',

     ],

 )

 

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index b0c7d15..78ecbb0 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -66,31 +66,10 @@ env_test.Prepend(
         '/nxcompat',

     ],

     LIBS = [

-         'winmm.lib',

-         'rpcrt4.lib',

-         'oleacc.lib',

          'comsupp.lib',

-

-         'wininet.lib',

-         'version.lib',

-         'msimg32.lib',

-         'ws2_32.lib',

-         'usp10.lib',

-         'psapi.lib',

-         'kernel32.lib',

-         'user32.lib',

-         'gdi32.lib',

-         'winspool.lib',

-         'comdlg32.lib',

-         'advapi32.lib',

-         'shell32.lib',

-         'ole32.lib',

-         'oleaut32.lib',

-         'uuid.lib',

-         'odbc32.lib',

-         'odbccp32.lib',

-

-         'DelayImp.lib',

+         'oleacc.lib',

+         'rpcrt4.lib',

+         'winmm.lib',

     ],

 )

 

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index cca1b6b..3c0cbf5 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -62,32 +62,11 @@ env_test.Prepend(
         '/nxcompat',

     ],

     LIBS = [

-        'winmm.lib',

-        'psapi.lib',

-        'rpcrt4.lib',

-        'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

+        'oleacc.lib',

         'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

+        'rpcrt4.lib',

+        'winmm.lib',

     ],

 )

 

diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index 653858c..2caf4d8 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -53,25 +53,6 @@ env.Prepend(
         '/DEBUG',

     ],

     LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

         'DelayImp.lib',

     ],

 )

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index 9d1ab25..25cc7c2 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -64,27 +64,6 @@ env_test.Prepend(
         'rpcrt4.lib',

         'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 3f8d1e1..744014b 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -64,27 +64,6 @@ env_test.Prepend(
         'rpcrt4.lib',

         'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index e41ce9a..034edce 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -65,27 +65,6 @@ env_test.Prepend(
         'rpcrt4.lib',

         'oleacc.lib',

         'comsupp.lib',

-

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

     ],

 )

 

diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript
index 538bf58..1227b11 100644
--- a/chrome/tools/crash_service/SConscript
+++ b/chrome/tools/crash_service/SConscript
@@ -52,28 +52,6 @@ env.Prepend(
         '/nxcompat',

 

     ],

-    LIBS = [

-        'advapi32.lib',

-        'comdlg32.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-

-        'DelayImp.lib',

-    ],

 )

 

 libs = [

diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index 22d927b..349375b 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -50,28 +50,6 @@ env_test.Prepend(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

-    ],

 )

 

 input_files = [

diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 6054a304..6511ba9 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -59,28 +59,6 @@ env_test.Prepend(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

-    ],

 )

 

 input_files = [

diff --git a/net/SConscript b/net/SConscript
index 4ebf744..01bd489 100644
--- a/net/SConscript
+++ b/net/SConscript
@@ -177,27 +177,6 @@ env_tests.Prepend(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        'advapi32.lib',

-        'comdlg32.lib',

-        'DelayImp.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-    ],

 )

 

 env_tests.Append(

diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript
index 7f1fe56..16f2286 100644
--- a/net/tools/tld_cleanup/SConscript
+++ b/net/tools/tld_cleanup/SConscript
@@ -56,28 +56,6 @@ env.Append(
         '/ignore:4199',

         '/nxcompat',

     ],

-

-    LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'DelayImp.lib',

-    ],

 )

 

 input_files = [

diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript
index 18c5977..7c3bdbf 100644
--- a/sandbox/src/SConscript
+++ b/sandbox/src/SConscript
@@ -141,32 +141,6 @@ env_tests.Prepend(
         '/ignore:4199',

         '/nxcompat',

     ],

-    LIBS = [

-        # System libraries.

-        'DelayImp.lib',

-        'advapi32.lib',

-        'comdlg32.lib',

-        'gdi32.lib',

-        'kernel32.lib',

-        'msimg32.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'psapi.lib',

-        'shell32.lib',

-        'user32.lib',

-        'usp10.lib',

-        'uuid.lib',

-        'version.lib',

-        'wininet.lib',

-        'winspool.lib',

-        'ws2_32.lib',

-

-        # Chrome libraries.

-        'base.lib',

-        'sandbox.lib',

-        ],

     LIBPATH = [

         '.',

         '$BASE_DIR'

diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index b8e0bfb..85ca5f6 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -55,28 +55,6 @@ env.Append(
 

         '/DEBUG',

     ],

-    LIBS = [

-        'wininet.lib',

-        'version.lib',

-        'msimg32.lib',

-        'ws2_32.lib',

-        'usp10.lib',

-        'psapi.lib',

-        'kernel32.lib',

-        'user32.lib',

-        'gdi32.lib',

-        'winspool.lib',

-        'comdlg32.lib',

-        'advapi32.lib',

-        'shell32.lib',

-        'ole32.lib',

-        'oleaut32.lib',

-        'uuid.lib',

-        'odbc32.lib',

-        'odbccp32.lib',

-

-        'DelayImp.lib',

-    ],

 )

 

 libs = [

diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index 3d8b0e4..7566c65 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -60,29 +60,9 @@ env.Append(
 
     LIBS = [
         'comctl32.lib',
-        'shlwapi.lib',
         'rpcrt4.lib',
+        'shlwapi.lib',
         'winmm.lib',
-        'wininet.lib',
-        'version.lib',
-        'msimg32.lib',
-        'ws2_32.lib',
-        'usp10.lib',
-        'psapi.lib',
-        'kernel32.lib',
-        'user32.lib',
-        'gdi32.lib',
-        'winspool.lib',
-        'comdlg32.lib',
-        'advapi32.lib',
-        'shell32.lib',
-        'ole32.lib',
-        'oleaut32.lib',
-        'uuid.lib',
-        'odbc32.lib',
-        'odbccp32.lib',
-
-        'delayimp.lib',
     ],
 
     LINKFLAGS = [
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript
index 7f8a30b..fbcb9f8 100644
--- a/webkit/tools/npapi_layout_test_plugin/SConscript
+++ b/webkit/tools/npapi_layout_test_plugin/SConscript
@@ -47,29 +47,10 @@ env.Append(
     ],
 
     LIBS = [
-        'advapi32.lib',
         'comctl32.lib',
-        'comdlg32.lib',
-        'delayimp.lib',
-        'gdi32.lib',
-        'kernel32.lib',
-        'msimg32.lib',
-        'odbc32.lib',
-        'odbccp32.lib',
-        'ole32.lib',
-        'oleaut32.lib',
-        'psapi.lib',
         'rpcrt4.lib',
-        'shell32.lib',
         'shlwapi.lib',
-        'user32.lib',
-        'usp10.lib',
-        'uuid.lib',
-        'version.lib',
-        'wininet.lib',
         'winmm.lib',
-        'winspool.lib',
-        'ws2_32.lib',
     ],
 
     LINKFLAGS = [
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 36393a0..85f7091 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -74,29 +74,9 @@ env.Append(
 
     LIBS = [
         'comctl32.lib',
-        'shlwapi.lib',
         'rpcrt4.lib',
+        'shlwapi.lib',
         'winmm.lib',
-        'wininet.lib',
-        'version.lib',
-        'msimg32.lib',
-        'ws2_32.lib',
-        'usp10.lib',
-        'psapi.lib',
-        'kernel32.lib',
-        'user32.lib',
-        'gdi32.lib',
-        'winspool.lib',
-        'comdlg32.lib',
-        'advapi32.lib',
-        'shell32.lib',
-        'ole32.lib',
-        'oleaut32.lib',
-        'uuid.lib',
-        'odbc32.lib',
-        'odbccp32.lib',
-
-        'delayimp.lib',
     ],
 
     LINKFLAGS = [