summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 06:27:57 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 06:27:57 +0000
commit5d6c69626c90ffce59fcb13eb8e66a29d400907b (patch)
tree38886242d045dc2b5a6e928c7726fa16789a2766 /build
parent38d8d15aa79cbb9cd08ddfa11b3121121f44f84f (diff)
downloadchromium_src-5d6c69626c90ffce59fcb13eb8e66a29d400907b.zip
chromium_src-5d6c69626c90ffce59fcb13eb8e66a29d400907b.tar.gz
chromium_src-5d6c69626c90ffce59fcb13eb8e66a29d400907b.tar.bz2
Refactor building unit_tests with SCons for the new structure:
* Rename SConscript.unit_tests to test/unit/unit_tests.scons. * Add a new chrome/chrome.scons "master" for building everything chrome. Have it just load the existing SConscript file, and the new test/unit/unit_tests.scons file. We'll move things from SConscript (or elsewhere) into chrome.scons as they get convertd. * Change build/SConscript.main to load chrome/chrome.scons. * Add new using_libjpeg.scons, using_libxml.scons, and using_libxslt.scons "properties" files. * Convert test/unit/unit_tests.scons to use the available using_*.scons files. * Combine settings that were scattered throught test/unit/unit_tests.scons to make it a little more readable. * Add $CHROME_DIR/ to the beginning of the file listed in test/unit/unit_tests.scons, since they're now being interpreted from a SConscript file down two directory levels. Review URL: http://codereview.chromium.org/9005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.main2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main
index 3c3903d..5913d9c 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -164,7 +164,7 @@ if LoadComponent('breakpad'):
sconscripts.append('$BREAKPAD_DIR/SConscript')
if LoadComponent('chrome'):
- sconscripts.append('$CHROME_DIR/SConscript')
+ sconscripts.append('$CHROME_DIR/chrome.scons')
if LoadComponent('gears'):
sconscripts.append('$GEARS_DIR/SConscript')