Skip to content
Snippets Groups Projects
Commit de2c4cca authored by evanm@google.com's avatar evanm@google.com
Browse files

Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the...

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
parent 1c4fdfb4
No related merge requests found
Showing
with 26 additions and 22 deletions
......@@ -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",
......
......@@ -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}',
......
......@@ -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}',
......
......@@ -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}')
......
......@@ -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:
......
......@@ -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 = [
......
......@@ -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}')
......@@ -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 = [
......
......@@ -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 = [
......
......@@ -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 = [
......
......@@ -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 = [
......
......@@ -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 = [
......
......@@ -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}')
......@@ -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 = [
......
......@@ -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}')
......@@ -82,7 +82,7 @@ input_files = [
'src/parsers/textparser.cxx',
]
env.ChromeStaticLibrary('hunspell', input_files)
env.ChromeLibrary('hunspell', input_files)
dictionaries = [
......
......@@ -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 = [
......
......@@ -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)
......
......@@ -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)
......
......@@ -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}')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment