diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
| commit | 012adff3836f208288c09323c0de2f93117c13c9 (patch) | |
| tree | d1af9d7e64632c7b79a774015cc0377f0801010c /webkit/tools/npapi_layout_test_plugin | |
| parent | 5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff) | |
| download | chromium_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/tools/npapi_layout_test_plugin')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/SConscript | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript index 329fb92..4b2da51 100644 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ b/webkit/tools/npapi_layout_test_plugin/SConscript @@ -45,7 +45,23 @@ if env['PLATFORM'] == 'win32': ], ) - dll = env.ChromeSharedLibrary('npapi_layout_test_plugin', input_files) +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) -i = env.Install('$MAIN_DIR/Hammer', dll[0]) +i = env.Install('$TARGET_ROOT/plugins', dll) env.Alias('webkit', i) + +i = env.Install('$TARGET_ROOT', dll) +env.Alias('webkit', i) + |