diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
| commit | de2c4cca42e52e97d240f6de1dbc8094777f9871 (patch) | |
| tree | 0d5bd659b3a6da4cdfa1831e174a730d12769595 /gears | |
| parent | 1c4fdfb4145e39979c5095546ced9f07578ccb4d (diff) | |
| download | chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.zip chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.gz chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.bz2 | |
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
Diffstat (limited to 'gears')
| -rw-r--r-- | gears/SConscript | 2 | ||||
| -rw-r--r-- | gears/SConscript.browser | 2 |
2 files changed, 2 insertions, 2 deletions
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) |