summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:43 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-03 21:21:43 +0000
commitf7df58905b11fa7df6fa01d2523e2136d6d774d0 (patch)
tree7d35f83aec26415f2dd16524b1308f868df9e75a /webkit/tools
parentf1db7a1f34514312bd704e1b966ff40d2666dee7 (diff)
downloadchromium_src-f7df58905b11fa7df6fa01d2523e2136d6d774d0.zip
chromium_src-f7df58905b11fa7df6fa01d2523e2136d6d774d0.tar.gz
chromium_src-f7df58905b11fa7df6fa01d2523e2136d6d774d0.tar.bz2
Convert webkit SConscript files to psuedo-builder calls.
TBR: evanm,bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/npapi_layout_test_plugin/SConscript2
-rw-r--r--webkit/tools/test_shell/SConscript6
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript
index 26b7896..7f8a30b 100644
--- a/webkit/tools/npapi_layout_test_plugin/SConscript
+++ b/webkit/tools/npapi_layout_test_plugin/SConscript
@@ -85,7 +85,7 @@ env.Append(
],
)
-dll = env.SharedLibrary(['npapi_layout_test_plugin',
+dll = env.ChromeSharedLibrary(['npapi_layout_test_plugin',
'npapi_layout_test_plugin.lib',
'npapi_layout_test_plugin.ilk',
'npapi_layout_test_plugin.pdb'],
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index a17cd8e..36393a0 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -113,7 +113,7 @@ env.Append(
],
)
-lib = env.Library('test_shell', input_files)
+lib = env.ChromeStaticLibrary('test_shell', input_files)
@@ -155,7 +155,7 @@ components = [
'$WEBKIT_DIR/glue/Glue.lib',
]
-test_shell = env.Program(['test_shell.exe',
+test_shell = env.ChromeProgram(['test_shell.exe',
'test_shell.ilk',
'test_shell.pdb'],
components + resources +
@@ -217,7 +217,7 @@ test_files = [
'$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp',
]
-test_shell_tests = env.Program(['test_shell_tests',
+test_shell_tests = env.ChromeTestProgram(['test_shell_tests',
'test_shell_tests.ilk',
'test_shell_tests.pdb'],
components + resources + test_files)