summaryrefslogtreecommitdiffstats
path: root/webkit/tools/npapi_layout_test_plugin
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 23:44:26 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 23:44:26 +0000
commitdfcec23417f5ac504a257f1c740404df69826792 (patch)
tree2939b84952c63d2de47d2aaeaa4d469ab17cef79 /webkit/tools/npapi_layout_test_plugin
parent63c2f1af4de7286e8f8b19f4921870a00fae64df (diff)
downloadchromium_src-dfcec23417f5ac504a257f1c740404df69826792.zip
chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.gz
chromium_src-dfcec23417f5ac504a257f1c740404df69826792.tar.bz2
Applying software construction toolkit patterns in scons build.
Review URL: http://codereview.chromium.org/6569 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin')
-rw-r--r--webkit/tools/npapi_layout_test_plugin/SConscript20
1 files changed, 2 insertions, 18 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript
index 4b2da51..329fb92 100644
--- a/webkit/tools/npapi_layout_test_plugin/SConscript
+++ b/webkit/tools/npapi_layout_test_plugin/SConscript
@@ -45,23 +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)
+i = env.Install('$MAIN_DIR/Hammer', dll[0])
env.Alias('webkit', i)
-
-i = env.Install('$TARGET_ROOT', dll)
-env.Alias('webkit', i)
-