summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:42:44 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:42:44 +0000
commitaa156ca673791d7dfeffd02862c28a7b25f08c7c (patch)
tree115bf7392b8e3c986d4e2a9eb351453192971d2e /webkit/SConscript
parentf890108d79ed124f122b1e2526866e0e96410ff9 (diff)
downloadchromium_src-aa156ca673791d7dfeffd02862c28a7b25f08c7c.zip
chromium_src-aa156ca673791d7dfeffd02862c28a7b25f08c7c.tar.gz
chromium_src-aa156ca673791d7dfeffd02862c28a7b25f08c7c.tar.bz2
Merge linux and windows test shells to share code.
This also forces the webkit grd files to be run through grit and .h files generated. Review URL: http://codereview.chromium.org/8976 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
-rw-r--r--webkit/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index d0fd611..1065e08 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -210,6 +210,7 @@ sconscript_dirs = [
'SConscript.javascriptcore_pcre',
'build/JSConfig/SConscript',
'build/JavaScriptCore/SConscript',
+ 'build/localized_strings/SConscript',
'build/port/SConscript',
'build/V8Bindings/SConscript',
'build/WebCore/SConscript',
@@ -225,7 +226,6 @@ if env['PLATFORM'] == 'win32':
sconscript_dirs.extend([
'activex_shim/SConscript',
'activex_shim_dll/SConscript',
- 'build/localized_strings/SConscript',
])
env.Append(