diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 05:18:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 05:18:29 +0000 |
| commit | 6a4994f4ae4e2462de032a1c8595e9dfb82376d5 (patch) | |
| tree | a1f7a2e138ae38dac4a7bf7854ee46bc99728377 /chrome/test | |
| parent | 4d74cc2ef9a46f78e086d499b9680d5028fd3df2 (diff) | |
| download | chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.zip chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.tar.gz chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.tar.bz2 | |
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
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/activex_test_control/SConscript | 20 | ||||
| -rw-r--r-- | chrome/test/chrome_plugin/SConscript | 21 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 27 | ||||
| -rw-r--r-- | chrome/test/mini_installer_test/SConscript | 27 | ||||
| -rw-r--r-- | chrome/test/page_cycler/SConscript | 27 | ||||
| -rw-r--r-- | chrome/test/plugin/SConscript | 27 | ||||
| -rw-r--r-- | chrome/test/reliability/SConscript | 27 | ||||
| -rw-r--r-- | chrome/test/security_tests/SConscript | 19 | ||||
| -rw-r--r-- | chrome/test/selenium/SConscript | 21 | ||||
| -rw-r--r-- | chrome/test/startup/SConscript | 21 | ||||
| -rw-r--r-- | chrome/test/tab_switching/SConscript | 21 |
11 files changed, 15 insertions, 243 deletions
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',
],
)
|