Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the updated ICU dep that uses it as well.

Add a SHARED scons command-line flag to build shared libraries.

Review URL: http://codereview.chromium.org/16477


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7479 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 51 insertions, 47 deletions

diff --git a/DEPS b/DEPS
index a4846ac..9e334fa 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ deps = {
     "/trunk/deps/third_party/WebKit@7457",
 
   "src/third_party/icu38":
-    "/trunk/deps/third_party/icu38@7121",
+    "/trunk/deps/third_party/icu38@7478",
 
   "src/v8":
     "http://v8.googlecode.com/svn/trunk@968",
diff --git a/base/base_lib.scons b/base/base_lib.scons
index 15791df..976a899 100644
--- a/base/base_lib.scons
+++ b/base/base_lib.scons
@@ -373,7 +373,7 @@ if env.Bit('linux'):
       'worker_pool.cc',
   ])
 
-env.ChromeStaticLibrary('base', input_files)
+env.ChromeLibrary('base', input_files)
 
 p = env.ChromeMSVSProject('build/base.vcproj',
                           guid='{1832A374-8A74-4F9E-B536-69A699B3E165}',
diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons
index bcffedc..5eb47db 100644
--- a/base/gfx/base_gfx.scons
+++ b/base/gfx/base_gfx.scons
@@ -56,7 +56,7 @@ elif env.Bit('linux'):
   input_files.Extend([
   ])
 
-env.ChromeStaticLibrary('base_gfx', input_files)
+env.ChromeLibrary('base_gfx', input_files)
 
 p = env.ChromeMSVSProject('../build/base_gfx.vcproj',
                           guid='{A508ADD3-CECE-4E0F-8448-2F5E454DF551}',
diff --git a/breakpad/SConscript b/breakpad/SConscript
index c80614b..fe2ca9f 100644
--- a/breakpad/SConscript
+++ b/breakpad/SConscript
@@ -26,7 +26,7 @@ if env.Bit('windows'):
       'src/common/windows/http_upload.cc',
   ]
 
-  env.ChromeStaticLibrary('breakpad_sender', sender_input_files)
+  env.ChromeLibrary('breakpad_sender', sender_input_files)
 
 env.ChromeMSVSProject('$BREAKPAD_DIR/breakpad_sender.vcproj',
                 guid='{9946A048-043B-4F8F-9E07-9297B204714C}')
@@ -48,7 +48,7 @@ elif env.Bit('linux'):
       'src/client/linux/handler/linux_thread.cc',
   ]
 
-env.ChromeStaticLibrary('breakpad_handler', handler_input_files)
+env.ChromeLibrary('breakpad_handler', handler_input_files)
 
 env.ChromeMSVSProject('$BREAKPAD_DIR/breakpad_handler.vcproj',
                 guid='{B55CA863-B374-4BAF-95AC-539E4FA4C90C}')
diff --git a/build/SConscript.main b/build/SConscript.main
index 5e6bfb1..1b70f11 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -513,6 +513,10 @@ if ARGUMENTS.get('PROFILE') == '1':
 if ARGUMENTS.get('SYMBOLS') == '1':
   linux_env.Append(CCFLAGS=['-g'])
 
+# Build shared libraries (useful for fast links) when SHARED=1.
+if ARGUMENTS.get('SHARED') == '1':
+  linux_env.Replace(COMPONENT_STATIC=False)
+
 # Build with system-provided NSS and GTK.
 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']:
   try:
diff --git a/build/SConscript.v8 b/build/SConscript.v8
index c41c38d..ec0bd83 100644
--- a/build/SConscript.v8
+++ b/build/SConscript.v8
@@ -83,9 +83,9 @@ if env.Bit('windows'):
   # TODO(evanm): this may be necessary on other platforms(?)
   i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8[0])
 
-env.ChromeStaticLibrary('v8_snapshot',
-                        ['$V8_MODE_DIR/libraries-empty${OBJSUFFIX}',
-                         '$V8_MODE_DIR/snapshot${OBJSUFFIX}'])
+env.ChromeLibrary('v8_snapshot',
+                  ['$V8_MODE_DIR/libraries-empty${OBJSUFFIX}',
+                   '$V8_MODE_DIR/snapshot${OBJSUFFIX}'])
 
 env.ChromeMSVSProject('$V8_DIR/tools/visual_studio/v8.vcproj',
                 dependencies = [
diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons
index 22e0f53..9e4f325 100644
--- a/build/googleurl_lib.scons
+++ b/build/googleurl_lib.scons
@@ -46,7 +46,7 @@ input_files = [
     'src/url_util.cc',
 ]
 
-env.ChromeStaticLibrary('googleurl', input_files)
+env.ChromeLibrary('googleurl', input_files)
 
 env.ChromeMSVSProject('$GOOGLEURL_DIR/build/googleurl.vcproj',
                 guid='{EF5E94AB-B646-4E5B-A058-52EF07B8351C}')
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index abfb6ff..b973939 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -315,7 +315,7 @@ if env.Bit('posix'):
 
 if not env.Bit('mac'):
   # TODO: This should work for all platforms.
-  env.ChromeStaticLibrary('browser', input_files)
+  env.ChromeLibrary('browser', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/browser/browser.vcproj',
                 dependencies = [
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index 0045c62..3c974f8 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -64,7 +64,7 @@ if env.Bit('mac'):
 
 if not env.Bit('mac'):
   # TODO(port): Enable for Mac.
-  env.ChromeStaticLibrary('debugger', input_files)
+  env.ChromeLibrary('debugger', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/browser/debugger/debugger.vcproj',
                 dependencies = [
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index 8cdcfee..ccbfd3f 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -137,7 +137,7 @@ if env.Bit('windows'):
       'find_bar_win.cc',
   ])
 
-env.ChromeStaticLibrary('browser_views', input_files)
+env.ChromeLibrary('browser_views', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/browser/views/browser_views.vcproj',
                 dependencies = [
diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index 14c2b92..58e1146 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -134,7 +134,7 @@ if env.Bit('posix'):
 
 if not env.Bit('mac'):
   # TODO(port): This should be enabled for all platforms.
-  env.ChromeStaticLibrary('common', input_files)
+  env.ChromeLibrary('common', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/common/common.vcproj',
                 dependencies = [
diff --git a/chrome/installer/util/util.scons b/chrome/installer/util/util.scons
index 5d43185..7bba84c 100644
--- a/chrome/installer/util/util.scons
+++ b/chrome/installer/util/util.scons
@@ -52,7 +52,7 @@ input_files = [
 
 # TODO(port):
 if env.Bit('windows'):
-  env.ChromeStaticLibrary('util', input_files)
+  env.ChromeLibrary('util', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/installer/util/util.vcproj',
                       dependencies = [
diff --git a/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons
index 3a100652..26a3702 100644
--- a/chrome/plugin/plugin.scons
+++ b/chrome/plugin/plugin.scons
@@ -56,7 +56,7 @@ if env.Bit('posix'):
   for remove in to_be_ported_files:
     input_files.remove(remove)
 
-env.ChromeStaticLibrary('plugin', input_files)
+env.ChromeLibrary('plugin', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/plugin/plugin.vcproj',
                 guid='{20A560A0-2CD0-4D9E-A58B-1F24B99C087A}')
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
index b8eda9f..d0639ba 100644
--- a/chrome/renderer/renderer.scons
+++ b/chrome/renderer/renderer.scons
@@ -101,7 +101,7 @@ if env.Bit('mac'):
 
 # TODO(port): Enable for Mac.
 if not env.Bit('mac'):
-  env.ChromeStaticLibrary('renderer', input_files)
+  env.ChromeLibrary('renderer', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/renderer/renderer.vcproj',
                 dependencies = [
diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons
index f894f72..2708f8b 100644
--- a/chrome/test/automation/automation.scons
+++ b/chrome/test/automation/automation.scons
@@ -29,7 +29,7 @@ input_files = [
 
 # TODO(port):
 if env.Bit('windows'):
-  env.ChromeStaticLibrary('automation', input_files)
+  env.ChromeLibrary('automation', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/test/automation/automation.vcproj',
                       guid='{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}')
diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index 7cc57e3..c5c9074 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -82,7 +82,7 @@ input_files = [
     'src/parsers/textparser.cxx',
 ]
 
-env.ChromeStaticLibrary('hunspell', input_files)
+env.ChromeLibrary('hunspell', input_files)
 
 
 dictionaries = [
diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index d415f0f..1c9779a 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -92,7 +92,7 @@ input_files = [
     'window_delegate.cc',
 ]
 
-env.ChromeStaticLibrary('views', input_files)
+env.ChromeLibrary('views', input_files)
 
 env.ChromeMSVSProject('$CHROME_DIR/views/views.vcproj',
                 dependencies = [
diff --git a/gears/SConscript b/gears/SConscript
index 9ad25c2..8c1d4b9 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -914,7 +914,7 @@ elif env['OS'] == 'android':
 # that value, scons gets confused.  I'm not sure who is at fault here.
 # See http://code.google.com/p/chromium/issues/detail?id=4177.
 def GearsStaticLibrary(env, *args, **kw):
-  lib = env.ChromeStaticLibrary(*args, **kw)
+  lib = env.ChromeLibrary(*args, **kw)
   env.Install('$COMPONENT_LIBRARY_DIR', lib[0])
   return lib
 env.AddMethod(GearsStaticLibrary)
diff --git a/gears/SConscript.browser b/gears/SConscript.browser
index fab0166..038878f 100644
--- a/gears/SConscript.browser
+++ b/gears/SConscript.browser
@@ -509,7 +509,7 @@ if env['OS'] in ['win32', 'wince'] and env['MODE'] == 'dbg':
 env.Alias('gears', outputs['MODULE'])
 
 if env['OS'] == 'win32' and env['BROWSER'] == 'NPAPI':
-  lib = env.ChromeStaticLibrary('gears-static',
+  lib = env.ChromeLibrary('gears-static',
       env.SharedObject(GetInputs('$BROWSER_CPPSRCS')) +
       GetInputs('$BROWSER_LINKSRCS'))
   env.Alias('gears-static', lib)
diff --git a/media/media_lib.scons b/media/media_lib.scons
index c6061ce..cb49698 100644
--- a/media/media_lib.scons
+++ b/media/media_lib.scons
@@ -45,7 +45,7 @@ if env.Bit('posix'):
   input_files.extend([
   ])
 
-env.ChromeStaticLibrary('media', input_files)
+env.ChromeLibrary('media', input_files)
 
 env.ChromeMSVSProject('$MEDIA_DIR/build/media.vcproj',
                 guid='{6AE76406-B03B-11DD-94B1-80B556D89593}')
diff --git a/net/net_lib.scons b/net/net_lib.scons
index d9566a6..70d36e9 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -169,7 +169,7 @@ if env.Bit('windows'):
   env.Append(CCPCHFLAGS = ['/FIprecompiled_net.h'])
   input_files += [obj]
 
-env.ChromeStaticLibrary('net', input_files)
+env.ChromeLibrary('net', input_files)
 
 env.ChromeMSVSProject('$NET_DIR/build/net.vcproj',
                 dependencies = [
diff --git a/sandbox/src/sandbox_lib.scons b/sandbox/src/sandbox_lib.scons
index 0189114..8667968 100644
--- a/sandbox/src/sandbox_lib.scons
+++ b/sandbox/src/sandbox_lib.scons
@@ -81,4 +81,4 @@ env['PCH'] = pch
 env['PCHSTOP'] = 'stdafx.h'
 env.Append(CCPCHFLAGS = ['/FIstdafx.h'])
 
-env.ChromeStaticLibrary('sandbox', input_files + [obj])
+env.ChromeLibrary('sandbox', input_files + [obj])
diff --git a/sdch/SConscript b/sdch/SConscript
index 0c6d2e1..6c70f45 100644
--- a/sdch/SConscript
+++ b/sdch/SConscript
@@ -32,7 +32,7 @@ input_files = [
     '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc',

 ]

 

-env.ChromeStaticLibrary('sdch', input_files)

+env.ChromeLibrary('sdch', input_files)

 

 env.ChromeMSVSProject('$SDCH_DIR/sdch.vcproj',

                 guid='{F54ABC59-5C00-414A-A9BA-BAF26D1699F0}')

diff --git a/skia/SConscript b/skia/SConscript
index 789006f..797652f 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -457,7 +457,7 @@ if env.Bit('windows'):
   env_p['PCH'] = pch
   input_files.Replace('precompiled.cc', obj)
 
-env.ChromeStaticLibrary('skia', input_files)
+env.ChromeLibrary('skia', input_files)
 
 p = env.ChromeMSVSProject('skia.vcproj',
                           guid='{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}',
diff --git a/testing/SConscript.gtest b/testing/SConscript.gtest
index 8df8d65..870bf51 100644
--- a/testing/SConscript.gtest
+++ b/testing/SConscript.gtest
@@ -43,7 +43,7 @@ input_files = ChromeFileList([
     'multiprocess_func_list.cc',
 ])
 
-env.ChromeStaticLibrary('gtest', input_files)
+env.ChromeLibrary('gtest', input_files)
 
 p = env.ChromeMSVSProject('gtest.vcproj',
                           guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}',
diff --git a/third_party/bspatch/bspatch.scons b/third_party/bspatch/bspatch.scons
index 97cf01c..654bc41 100644
--- a/third_party/bspatch/bspatch.scons
+++ b/third_party/bspatch/bspatch.scons
@@ -27,7 +27,7 @@ input_files = [
     'mbspatch.cc',
 ]
 
-env.ChromeStaticLibrary('bspatch', input_files)
+env.ChromeLibrary('bspatch', input_files)
 
 env.ChromeMSVSProject('$BSPATCH_DIR/bspatch.vcproj',
                 guid='{D7ED06E8-6138-4CE3-A906-5EF1D9C804E0}')
diff --git a/third_party/bzip2/bzip2.scons b/third_party/bzip2/bzip2.scons
index 843de84..c144906 100644
--- a/third_party/bzip2/bzip2.scons
+++ b/third_party/bzip2/bzip2.scons
@@ -38,7 +38,7 @@ input_files = [
     'randtable.c',
 ]
 
-env.ChromeStaticLibrary('bzip2', input_files)
+env.ChromeLibrary('bzip2', input_files)
 
 env.ChromeMSVSProject('$BZIP2_DIR/bzip2.vcproj',
                 guid='{2A70CBF0-847E-4E3A-B926-542A656DC7FE}')
diff --git a/third_party/libevent/libevent.scons b/third_party/libevent/libevent.scons
index 124f825..f8fc4bf 100644
--- a/third_party/libevent/libevent.scons
+++ b/third_party/libevent/libevent.scons
@@ -73,4 +73,4 @@ if env.Bit('mac'):
   ])
 
 
-env.ChromeStaticLibrary('event', input_files)
+env.ChromeLibrary('event', input_files)
diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons
index 0cc3919..fb1e295e 100644
--- a/third_party/libjpeg/libjpeg.scons
+++ b/third_party/libjpeg/libjpeg.scons
@@ -99,7 +99,7 @@ input_files = [
     'jutils.c',
 ]
 
-env.ChromeStaticLibrary('libjpeg', input_files)
+env.ChromeLibrary('libjpeg', input_files)
 
 env.ChromeMSVSProject('$LIBJPEG_DIR/libjpeg.vcproj',
                 guid='{238CE175-76CE-4A25-A676-69D115885601}')
diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons
index 8716157..9c366a9 100644
--- a/third_party/libpng/libpng.scons
+++ b/third_party/libpng/libpng.scons
@@ -62,7 +62,7 @@ input_files = ChromeFileList([
     'pngwutil.c',
 ])
 
-env.ChromeStaticLibrary('libpng', input_files)
+env.ChromeLibrary('libpng', input_files)
 
 p = env.ChromeMSVSProject('libpng.vcproj',
                           guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}',
diff --git a/third_party/libxml/libxml.scons b/third_party/libxml/libxml.scons
index 63cd173..d7f05fa 100644
--- a/third_party/libxml/libxml.scons
+++ b/third_party/libxml/libxml.scons
@@ -113,7 +113,7 @@ input_files = [
     'xpointer.c',
 ]
 
-env.ChromeStaticLibrary('libxml', input_files)
+env.ChromeLibrary('libxml', input_files)
 
 env.ChromeMSVSProject('$LIBXML_DIR/build/libxml.vcproj',
                 dependencies = [
diff --git a/third_party/libxslt/libxslt.scons b/third_party/libxslt/libxslt.scons
index f40bf8f..6e95764 100644
--- a/third_party/libxslt/libxslt.scons
+++ b/third_party/libxslt/libxslt.scons
@@ -85,7 +85,7 @@ input_files = [
     'libxslt/xsltutils.c',
 ]
 
-env.ChromeStaticLibrary('libxslt', input_files)
+env.ChromeLibrary('libxslt', input_files)
 
 env.ChromeMSVSProject('$LIBXSLT_DIR/build/libxslt.vcproj',
                 dependencies = [
diff --git a/third_party/lzma_sdk/lzma_sdk.scons b/third_party/lzma_sdk/lzma_sdk.scons
index fc16f9e..e50c5ea 100644
--- a/third_party/lzma_sdk/lzma_sdk.scons
+++ b/third_party/lzma_sdk/lzma_sdk.scons
@@ -46,7 +46,7 @@ input_files = [
     'Compress/Lzma/LzmaDecode.c',
 ]
 
-env.ChromeStaticLibrary('lzma_sdk', input_files)
+env.ChromeLibrary('lzma_sdk', input_files)
 
 env.ChromeMSVSProject('$LZMA_SDK_DIR/7z_C.vcproj',
                 name='lzma_sdk',
diff --git a/third_party/modp_b64/modp_b64.scons b/third_party/modp_b64/modp_b64.scons
index bdc1162..f114e8e 100644
--- a/third_party/modp_b64/modp_b64.scons
+++ b/third_party/modp_b64/modp_b64.scons
@@ -22,7 +22,7 @@ input_files = [
     'modp_b64.cc',
 ]
 
-env.ChromeStaticLibrary('modp_b64', input_files)
+env.ChromeLibrary('modp_b64', input_files)
 
 env.ChromeMSVSProject('$MODP_B64_DIR/modp_b64.vcproj',
                 guid='{7100F41F-868D-4E99-80A2-AF8E6574749D}')
diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript
index 3c891b8..eb69b44 100644
--- a/third_party/sqlite/SConscript
+++ b/third_party/sqlite/SConscript
@@ -91,7 +91,7 @@ input_files = [
     'where.c',
 ]
 
-env.ChromeStaticLibrary('sqlite', input_files)
+env.ChromeLibrary('sqlite', input_files)
 
 env.ChromeMSVSProject('$SQLITE_DIR/sqlite.vcproj',
                 guid='{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}')
diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons
index 91c19ae..5aa0299 100644
--- a/third_party/zlib/zlib.scons
+++ b/third_party/zlib/zlib.scons
@@ -52,7 +52,7 @@ input_files = ChromeFileList([
     'zutil.h',
 ])
 
-env.ChromeStaticLibrary('zlib', input_files)
+env.ChromeLibrary('zlib', input_files)
 
 p = env.ChromeMSVSProject('zlib.vcproj',
                           guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}',
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre
index 6694b67..d30e771 100644
--- a/webkit/SConscript.javascriptcore_pcre
+++ b/webkit/SConscript.javascriptcore_pcre
@@ -49,7 +49,7 @@ input_files = [
      '$PCRE_DIR/pcre_exec.cpp',

 ]

 

-env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files)

+env.ChromeLibrary('JavaScriptCore_pcre', input_files)

 

 env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',

                 guid='{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}')

diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index fdef9e4..d23902e 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -54,7 +54,7 @@ else:
     '$PORT_DIR/bindings/v8/ScriptController.cpp',

   ])

 

-env.ChromeStaticLibrary("port", input_files)

+env.ChromeLibrary("port", input_files)

 

 env.ChromeMSVSProject('$WEBKIT_DIR/build/port/port.vcproj',

                 name = 'Port',

diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript
index 41faa5d..b136c16 100644
--- a/webkit/activex_shim/SConscript
+++ b/webkit/activex_shim/SConscript
@@ -39,7 +39,7 @@ input_files = [
     'web_activex_site.cc',
 ]
 
-env.ChromeStaticLibrary('activex_shim', input_files)
+env.ChromeLibrary('activex_shim', input_files)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/activex_shim/activex_shim.vcproj',
                 dependencies = [
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 26a08ec..9fd54a6 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -173,7 +173,7 @@ elif env.Bit('linux'):
   env.ParseConfig('pkg-config --cflags --libs glib-2.0')
 
 
-env.ChromeStaticLibrary('WTF', wtf_inputs)
+env.ChromeLibrary('WTF', wtf_inputs)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
                 guid='{AA8A5A85-592B-4357-BC60-E0E91E026AF6}')
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index a1af82c..e238757 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -346,7 +346,7 @@ inputs = [
 if env.Bit('windows'):
   inputs.append('precompiled_v8bindings.cpp')
 
-env.ChromeStaticLibrary('V8Bindings', inputs)
+env.ChromeLibrary('V8Bindings', inputs)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
                 dependencies = [
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 621898e..517f170 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -951,7 +951,7 @@ if env.Bit('windows'):
   env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
   input_files += [obj]
 
-env.ChromeStaticLibrary('WebCore', input_files)
+env.ChromeLibrary('WebCore', input_files)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
                 dependencies = [
diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript
index 8b9047d..3c84f9a 100644
--- a/webkit/default_plugin/SConscript
+++ b/webkit/default_plugin/SConscript
@@ -50,7 +50,7 @@ if env.Bit('windows'):
       'install_dialog.cc',
   ])
 
-env.ChromeStaticLibrary('default_plugin', input_files)
+env.ChromeLibrary('default_plugin', input_files)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/default_plugin/default_plugin.vcproj',
                 dependencies = [
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 6670025..26a2d74 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -132,7 +132,7 @@ if env.Bit('posix'):
     'plugins/plugin_stream_posix.cc',
   ])
 
-env.ChromeStaticLibrary('glue', input_files)
+env.ChromeLibrary('glue', input_files)
 
 env.ChromeMSVSProject('$WEBKIT_DIR/build/glue/glue.vcproj',
                 name = 'Glue',
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index d6e6bd6..f41ee88 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -132,7 +132,7 @@ elif env.Bit('linux'):
       'test_webview_delegate_gtk.cc',
   ])
 
-lib = env.ChromeStaticLibrary('test_shell', input_files)
+lib = env.ChromeLibrary('test_shell', input_files)
 
 env.Append(LIBS = ['test_shell'])