summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/test/SConscript
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-18 00:30:22 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-18 00:30:22 +0000
commit012adff3836f208288c09323c0de2f93117c13c9 (patch)
treed1af9d7e64632c7b79a774015cc0377f0801010c /webkit/glue/plugins/test/SConscript
parent5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff)
downloadchromium_src-012adff3836f208288c09323c0de2f93117c13c9.zip
chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.gz
chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.bz2
Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/test/SConscript')
-rw-r--r--webkit/glue/plugins/test/SConscript15
1 files changed, 13 insertions, 2 deletions
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index bfdc821..3e90365 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -69,7 +69,18 @@ if env['PLATFORM'] == 'win32':
],
)
-dll = env.ChromeSharedLibrary('npapi_test_plugin', input_files)
+ dll = env.ChromeSharedLibrary([
+ 'npapi_test_plugin',
+ 'npapi_test_plugin.lib',
+ 'npapi_test_plugin.ilk',
+ 'npapi_test_plugin.pdb'
+ ], input_files)
-i = env.Replicate('$MAIN_DIR/Hammer', dll[0])
+ # 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)
+
+i = env.Install('$TARGET_ROOT', dll)
env.Alias('webkit', i)
+