summaryrefslogtreecommitdiffstats
path: root/chrome/test/interactive_ui/interactive_ui_tests.scons
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 01:12:38 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 01:12:38 +0000
commit5c6f1c6b32f9da207706cf2d94560196e9d20303 (patch)
tree9442eb8482e433b812c917e7c1760c3472d8dab7 /chrome/test/interactive_ui/interactive_ui_tests.scons
parent73f5d66b06b9a02626a8addecb24986a88430176 (diff)
downloadchromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.zip
chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.gz
chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.bz2
Finish release (opt) builds on Windows, including the parallel
build\*.scons structure (mirroring build\*.vsprops files): * Use env.ApplySConscript() instead of env.SConscript with a hand-crafted dictionary defining 'env'. * Move various CPPPATH, CCFLAGS, CPPDEFINES, LIBS and LIBPATH definitions from build/SConscript.main and target-specific *.scons files into the build\*.scons files that mirror the existing build\*.vsprops hierarchy. * Use the new build\{debug,release}.scons files to update the windows_dbg and windows_opt construction environments. * Mirror current support for CHROME_BUILD_TYPE and CHROMIUM_BUILD external environment variables. * Remove hard-coded /TP options. * Massage $CXXFLAGS to remove $CCFLAGS, avoiding duplication of options on command lines. Handle the ripple effect in $PCHCOM by adding $CCFLAGS back to that command line. * Delete hammer's default settings of {CC,LINK}FLAGS_{DEBUG,OPTIMIZED} so they don't pollute our construction environments. * Update chrome config to link against v8 for opt, v8_g for dbg. * Get rid of fragile by-hand order of using_net.scons before other using_*.scons files. We're now using --start-group and --end-group on Linux to deal with dependency cycles in libraries. Review URL: http://codereview.chromium.org/11478 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui/interactive_ui_tests.scons')
-rw-r--r--chrome/test/interactive_ui/interactive_ui_tests.scons2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons
index 5f724f2..e60de9a 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.scons
+++ b/chrome/test/interactive_ui/interactive_ui_tests.scons
@@ -13,6 +13,7 @@ env.SConscript([
'$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
'$CHROME_DIR/third_party/wtl/using_wtl.scons',
'$CHROME_SRC_DIR/build/using_googleurl.scons',
+ '$CHROME_SRC_DIR/build/using_v8.scons',
'$GTEST_DIR/../using_gtest.scons',
'$ICU38_DIR/using_icu38.scons',
'$LIBJPEG_DIR/using_libjpeg.scons',
@@ -54,7 +55,6 @@ env.Prepend(
'test_chrome_plugin',
'util',
'views',
- 'v8_g',
'v8_snapshot',
'V8Bindings',
'WebCore',