12 files changed, 14 insertions, 14 deletions
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre
index d298028..9e849c2 100644
--- a/webkit/SConscript.javascriptcore_pcre
+++ b/webkit/SConscript.javascriptcore_pcre
@@ -63,4 +63,4 @@ input_files = [
      '$PCRE_DIR/pcre_exec.cpp',
 ]
 
-env.Library('JavaScriptCore_pcre', input_files)
+env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files)
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 2d66a43..8e3409e 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -134,4 +134,4 @@ input_files = [
     '$PORT_DIR/page/DragControllerWin.cpp',
 ]
 
-env.Library("Port.lib", input_files)
+env.ChromeStaticLibrary("Port.lib", input_files)
diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript
index 5b6b038..8855e64 100644
--- a/webkit/activex_shim/SConscript
+++ b/webkit/activex_shim/SConscript
@@ -65,4 +65,4 @@ input_files = [
     'web_activex_site.cc',
 ]
 
-env.StaticLibrary('activex_shim', input_files)
+env.ChromeStaticLibrary('activex_shim', input_files)
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index 394b2b9..b8e0bfb 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -91,6 +91,6 @@ input_files = [
     'activex_shim_dll.def',
 ]
 
-dll = env.SharedLibrary('npaxshim', input_files + libs)
+dll = env.ChromeSharedLibrary('npaxshim', input_files + libs)
 i = env.Install('$TARGET_ROOT', dll)
 env.Alias('webkit', i)
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 003a331..32feacd 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -167,4 +167,4 @@ wtf_inputs = [
     '$WTF_DIR/HashTable.cpp',
 ]
 
-env.Library('WTF', wtf_inputs)
+env.ChromeStaticLibrary('WTF', wtf_inputs)
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 62eb813..aeb9ebc 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -322,4 +322,4 @@ inputs = [
 ]
 
 
-env.Library('V8Bindings', inputs)
+env.ChromeStaticLibrary('V8Bindings', inputs)
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index a75ff8e..e184d27 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -699,4 +699,4 @@ input_files = [
     '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp',
 ]
 
-env.StaticLibrary('WebCore', input_files + [obj])
+env.ChromeStaticLibrary('WebCore', input_files + [obj])
diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript
index 0b790e9..ebe27b4 100644
--- a/webkit/default_plugin/SConscript
+++ b/webkit/default_plugin/SConscript
@@ -65,4 +65,4 @@ input_files = [
     'install_dialog.cc',
 ]
 
-env.StaticLibrary('default_plugin', input_files)
+env.ChromeStaticLibrary('default_plugin', input_files)
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index ee3ea9a..a9c4ecc 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -101,6 +101,6 @@ input_files = [
     'webwidget_impl.cc',
 ]
 
-env.StaticLibrary('Glue', input_files)
+env.ChromeStaticLibrary('Glue', input_files)
 
 
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index 9af7cdf..3d8b0e4 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -98,7 +98,7 @@ env.Append(
     ],
 )
 
-dll = env.SharedLibrary(['npapi_test_plugin',
+dll = env.ChromeSharedLibrary(['npapi_test_plugin',
                          'npapi_test_plugin.ilk',
                          'npapi_test_plugin.pdb'],
                          input_files)
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)