From 9362db329ee86b44dd77dbf013c0698348a66eee Mon Sep 17 00:00:00 2001
From: "evanm@google.com"
 <evanm@google.com@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Fri, 26 Dec 2008 04:38:25 +0000
Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@7479 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 SConscript.main     | 4 ++++
 SConscript.v8       | 6 +++---
 googleurl_lib.scons | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SConscript.main b/SConscript.main
index 5e6bfb1dd..1b70f11fc 100644
--- a/SConscript.main
+++ b/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/SConscript.v8 b/SConscript.v8
index c41c38d84..ec0bd835c 100644
--- a/SConscript.v8
+++ b/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/googleurl_lib.scons b/googleurl_lib.scons
index 22e0f5361..9e4f3252e 100644
--- a/googleurl_lib.scons
+++ b/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}')