From 0de507433231840cc4043725dfe5e74b14543b52 Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Fri, 24 Oct 2008 05:08:22 +0000 Subject: 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 --- webkit/tools/npapi_layout_test_plugin/SConscript | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'webkit/tools') 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) -- cgit v1.1