diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:56:03 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:56:03 +0000 |
| commit | 6659178d57e1ee7d67f035d5c82e907b2fbbb7a0 (patch) | |
| tree | 6845c8ba02827d756ca6c4c80baf94bfdb666270 /webkit | |
| parent | b6badfa6a538f889025db775662fe61fcb45dc37 (diff) | |
| download | chromium_src-6659178d57e1ee7d67f035d5c82e907b2fbbb7a0.zip chromium_src-6659178d57e1ee7d67f035d5c82e907b2fbbb7a0.tar.gz chromium_src-6659178d57e1ee7d67f035d5c82e907b2fbbb7a0.tar.bz2 | |
Revert "Revert 69762 - Erase the old NPAPI Pepper (Pepper 1) test plugin."
Manually reverting r69765, which was itself a failed
revert of r69762.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/6028004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 9ebd278..2a82ec3 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -654,76 +654,6 @@ }], ], }, - { - 'target_name': 'npapi_pepper_test_plugin', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'msvs_guid': '821F3B89-6AE1-4254-99CB-93C04D0A79BE', - 'dependencies': [ - '<(DEPTH)/gpu/gpu.gyp:pgl', - '<(DEPTH)/third_party/gles2_book/gles2_book.gyp:stencil_test', - 'npapi_test_common', - ], - 'sources': [ - '../npapi_pepper_test_plugin/main.cc', - '../npapi_pepper_test_plugin/pepper_3d_test.cc', - '../npapi_pepper_test_plugin/pepper_3d_test.h', - '../npapi_pepper_test_plugin/plugin.def', - '../npapi_pepper_test_plugin/plugin.rc', - '../npapi_pepper_test_plugin/test_factory.cc', - ], - 'include_dirs': [ - '../../..', - ], - 'conditions': [ - ['OS!="win"', { - # windows-specific resources - 'sources!': [ - '../npapi_pepper_test_plugin/plugin.def', - '../npapi_pepper_test_plugin/plugin.rc', - ], - }], - ['OS=="mac"', { - 'product_extension': 'plugin', - }], - ], - 'xcode_settings': { - '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"', { |