| Index: site_scons/site_tools/chromium_builders.py
|
| ===================================================================
|
| --- site_scons/site_tools/chromium_builders.py (revision 11640)
|
| +++ site_scons/site_tools/chromium_builders.py (working copy)
|
| @@ -90,37 +90,58 @@
|
|
|
| def ChromeProgram(env, target, source, *args, **kw):
|
| source = compilable_files(env, source)
|
| - result = env.ComponentProgram(target, source, *args, **kw)
|
| + if env.get('_GYP'):
|
| + result = env.Program(target, source, *args, **kw)
|
| + else:
|
| + result = env.ComponentProgram(target, source, *args, **kw)
|
| if env.get('INCREMENTAL'):
|
| env.Precious(result)
|
| return result
|
|
|
| def ChromeTestProgram(env, target, source, *args, **kw):
|
| source = compilable_files(env, source)
|
| - result = env.ComponentTestProgram(target, source, *args, **kw)
|
| + if env.get('_GYP'):
|
| + result = env.Program(target, source, *args, **kw)
|
| + else:
|
| + result = env.ComponentTestProgram(target, source, *args, **kw)
|
| if env.get('INCREMENTAL'):
|
| env.Precious(*result)
|
| return result
|
|
|
| def ChromeLibrary(env, target, source, *args, **kw):
|
| source = compilable_files(env, source)
|
| - return env.ComponentLibrary(target, source, *args, **kw)
|
| + if env.get('_GYP'):
|
| + result = env.Library(target, source, *args, **kw)
|
| + else:
|
| + result = env.ComponentLibrary(target, source, *args, **kw)
|
| + return result
|
|
|
| def ChromeStaticLibrary(env, target, source, *args, **kw):
|
| source = compilable_files(env, source)
|
| - kw['COMPONENT_STATIC'] = True
|
| - return env.ComponentLibrary(target, source, *args, **kw)
|
| + if env.get('_GYP'):
|
| + result = env.StaticLibrary(target, source, *args, **kw)
|
| + else:
|
| + kw['COMPONENT_STATIC'] = True
|
| + result = env.ComponentLibrary(target, source, *args, **kw)
|
| + return result
|
|
|
| def ChromeSharedLibrary(env, target, source, *args, **kw):
|
| source = compilable_files(env, source)
|
| - kw['COMPONENT_STATIC'] = False
|
| - result = [env.ComponentLibrary(target, source, *args, **kw)[0]]
|
| + if env.get('_GYP'):
|
| + result = env.SharedLibrary(target, source, *args, **kw)
|
| + else:
|
| + kw['COMPONENT_STATIC'] = False
|
| + result = [env.ComponentLibrary(target, source, *args, **kw)[0]]
|
| if env.get('INCREMENTAL'):
|
| env.Precious(result)
|
| return result
|
|
|
| def ChromeObject(env, *args, **kw):
|
| - return env.ComponentObject(*args, **kw)
|
| + if env.get('_GYP'):
|
| + result = env.Object(target, source, *args, **kw)
|
| + else:
|
| + result = env.ComponentObject(*args, **kw)
|
| + return result
|
|
|
| def ChromeMSVSFolder(env, *args, **kw):
|
| if not env.Bit('msvs'):
|
|
|