diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 05:08:22 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 05:08:22 +0000 |
| commit | 0de507433231840cc4043725dfe5e74b14543b52 (patch) | |
| tree | e7e251b5b2ead3fead516d389964ca1741fbdddb /webkit | |
| parent | 2a18aed2289c0bcbb054d8b5e17dc23b37570e99 (diff) | |
| download | chromium_src-0de507433231840cc4043725dfe5e74b14543b52.zip chromium_src-0de507433231840cc4043725dfe5e74b14543b52.tar.gz chromium_src-0de507433231840cc4043725dfe5e74b14543b52.tar.bz2 | |
Actually adding the new scons toolkit (hammer) base tools to the built
environment.
Things have been rigged temporarily so they emit to the same directories.
Review URL: http://codereview.chromium.org/8139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 12 | ||||
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/SConscript | 14 |
2 files changed, 2 insertions, 24 deletions
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index ee8a4f2..6d9ab1f 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -70,17 +70,7 @@ if env['PLATFORM'] == 'win32': ], ) - dll = env.ChromeSharedLibrary([ - 'npapi_test_plugin', - 'npapi_test_plugin.lib', - 'npapi_test_plugin.ilk', - 'npapi_test_plugin.pdb' - ], input_files) - - # TODO(sgk): goes away once ChromeSharedLibrary does this for us. - env.Install('$LIBS_DIR', dll[1]) -else: - dll = env.ChromeSharedLibrary(['npapi_test_plugin'], input_files) +dll = env.ChromeSharedLibrary('npapi_test_plugin', input_files) i = env.Install('$TARGET_ROOT', dll) env.Alias('webkit', i) diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript index 4b2da51..b4568b8 100644 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ b/webkit/tools/npapi_layout_test_plugin/SConscript @@ -45,19 +45,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'win32': - dll = env.ChromeSharedLibrary([ - 'npapi_layout_test_plugin', - 'npapi_layout_test_plugin.lib', - 'npapi_layout_test_plugin.ilk', - 'npapi_layout_test_plugin.pdb' - ], input_files) - - # TODO(sgk): goes away when env.ChromeSharedLibrary() knows how - # to do this for us. - env.Install('$LIBS_DIR', dll[1]) -else: - dll = env.ChromeSharedLibrary(['npapi_layout_test_plugin'], input_files) +dll = env.ChromeSharedLibrary('npapi_layout_test_plugin', input_files) i = env.Install('$TARGET_ROOT/plugins', dll) env.Alias('webkit', i) |