diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:35:44 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 05:35:44 +0000 |
| commit | d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7 (patch) | |
| tree | 6795a61276e10ddf48fc4c095ca18da479121c51 /chrome/test/reliability | |
| parent | 6ea265a8b1b6e1512992945efa08942f575ad4c1 (diff) | |
| download | chromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.zip chromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.tar.gz chromium_src-d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7.tar.bz2 | |
Accumulated SCons changes for Windows chrome build and other
recent additions (doesn't fix everything, but gets significant
pieces back on track).
* New/additional library dependencies in various test executables
(too many to be worth listing).
* Portability: put library base names in $LIBS instead of explicitly
listing .lib files.
* Have interactive_ui re-use various object files from test/ui
instead of (re-)listing the .cc files.
* Add new files:
chrome\browser\bookmarks\bookmark_drag_data.cc
chrome\browser\bookmarks\bookmark_drag_utils.cc
chrome\browser\bookmarks\bookmark_table_model.cc
chrome\browser\browser_trial.cc
chrome\browser\download\download_request_manager_unittest.cc
chrome\browser\greasmonkey_master.cc
chrome\browser\spellcheck_unittest.cc
chrome\browser\views\find_bar_view.cc
chrome\browser\views\find_bar_win.cc
chrome\renderer\greasemonkey_slave.cc
* Remove old files:
chrome\browser\find_in_page_controller.cc
chrome\browser\find_in_page_view.cc
chrome\renderer\spellcheck_unittest.cc
* Remove relative reference to ../../app/google_update_settings$OBJSUFFIX.
* Get rid of by-hand /IMPLIB and /MAP flags.
* Prefix / suffix portability in the jscre library.
* Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources.
* Add $CHROME_DIR/app/resources to CPPPATH.
* Add icu38 directories to CPPPATH for building chrome/views files.
Review URL: http://codereview.chromium.org/8725
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/reliability')
| -rw-r--r-- | chrome/test/reliability/SConscript | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript index 0922599..3504e61 100644 --- a/chrome/test/reliability/SConscript +++ b/chrome/test/reliability/SConscript @@ -22,22 +22,27 @@ env_test.Prepend( '$CHROME_SRC_DIR', ], LIBS = [ + 'automation', + 'base', + 'base_gfx', + 'browser', + 'browser_views', + 'common', 'googleurl', - 'skia', - 'libpng', 'gtest', - 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'common', + 'libpng', + 'modp_b64', + 'net', + 'skia', 'zlib', - 'browser', - 'browser_views', - 'base', - 'automation', - ], -) -env_test.Prepend( + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -53,13 +58,6 @@ env_test.Prepend( '/ignore:4199', '/nxcompat', ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], ) input_files = [ |