diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:18:12 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:18:12 +0000 |
| commit | 6c5b9f9df3d703adf1cd76b69b86d87d80215fc9 (patch) | |
| tree | f26930b199f6c595e91e22168811cbf2315291b3 /webkit | |
| parent | 7a99970fadb988cb50e8de96bb4159ab308c007f (diff) | |
| download | chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.zip chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.tar.gz chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.tar.bz2 | |
Revert "Copy the npapi pepper test plugin during the build so we don't"
This reverts commit r55235.
Review URL: http://codereview.chromium.org/3090020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 68 |
1 files changed, 1 insertions, 67 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 52d68bc..5bbb1fa 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -124,7 +124,7 @@ # http://code.google.com/p/chromium/issues/detail?id=18337 ['target_arch!="x64" and target_arch!="arm"', { 'dependencies': [ - 'copy_npapi_test_plugin', + 'npapi_test_plugin', ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { @@ -583,39 +583,6 @@ ], }, { - 'target_name': 'copy_npapi_test_plugin', - 'type': 'none', - 'dependencies': [ - 'npapi_test_plugin', - ], - 'conditions': [ - ['OS=="win"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins', - 'files': ['<(PRODUCT_DIR)/npapi_test_plugin.dll'], - }, - ], - }], - ['OS=="mac"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins/', - 'files': ['<(PRODUCT_DIR)/npapi_test_plugin.plugin'], - }, - ] - }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins', - 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], - }, - ], - }], - ], - }, - { 'target_name': 'npapi_pepper_test_plugin', 'type': 'loadable_module', 'mac_bundle': 1, @@ -649,39 +616,6 @@ 'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/npapi_pepper_test_plugin/Info.plist', }, }, - { - 'target_name': 'copy_npapi_pepper_test_plugin', - 'type': 'none', - 'dependencies': [ - 'npapi_pepper_test_plugin', - ], - 'conditions': [ - ['OS=="win"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins', - 'files': ['<(PRODUCT_DIR)/npapi_pepper_test_plugin.dll'], - }, - ], - }], - ['OS=="mac"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins/', - 'files': ['<(PRODUCT_DIR)/npapi_pepper_test_plugin.plugin/'], - }, - ] - }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/plugins', - 'files': ['<(PRODUCT_DIR)/libnpapi_pepper_test_plugin.so'], - }, - ], - }], - ], - }, ], }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |