summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 23:29:55 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 23:29:55 +0000
commit1796a623c98ac36e9c6f7954e4cc25dab39551b9 (patch)
tree1cb96cf86ae54651e2081e20c379d5b216477d3f /build
parentba990126c119b5df777b9afcdc3d216cb9f21e5b (diff)
downloadchromium_src-1796a623c98ac36e9c6f7954e4cc25dab39551b9.zip
chromium_src-1796a623c98ac36e9c6f7954e4cc25dab39551b9.tar.gz
chromium_src-1796a623c98ac36e9c6f7954e4cc25dab39551b9.tar.bz2
Add a webkit.scons file in between build\SConscript.main and
webkit\SConscript, as a place for calling renamed *.scons files. Add 'webkit' and 'chrome' COMPONENT_PROGRAM_GROUPS and COMPONENT_TEST_PROGRAM_GROUPS so the generated .exe files get copied correctly into the Hammer\ build subdirectory. Review URL: http://codereview.chromium.org/10768 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5518 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 8ccac3b..6825bd2 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -263,7 +263,7 @@ if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists():
sconscripts.append('$OBJ_ROOT/build/SConscript.v8')
if LoadComponent('webkit'):
- sconscripts.append('$WEBKIT_DIR/SConscript')
+ sconscripts.append('$WEBKIT_DIR/webkit.scons')
# Add the final list into the root environment to be build in BuildComponents.