diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
| commit | 69a613f3a95c188524ac8e590fb45396b047c9ee (patch) | |
| tree | 007131a97049053a3e2967fa2c1695c8c0583b1a /webkit/tools/npapi_layout_test_plugin | |
| parent | 989b6e8061bff363e43f13f5aa9bacef6b321603 (diff) | |
| download | chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.zip chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.gz chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.bz2 | |
Adding in new hammer patterns. Restored from rollback change 3578.
Review URL: http://codereview.chromium.org/7656
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3597 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, 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) - |