Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Unified Diff: content/content_tests.gypi

Issue 19697013: Move NPAPI test plugin to content/test/plugin. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/npapi/plugin_stream_url.h ('k') | content/test/plugin/Info.plist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
===================================================================
--- content/content_tests.gypi (revision 212513)
+++ content/content_tests.gypi (working copy)
@@ -961,7 +961,7 @@
# npapi test plugin doesn't build on android or ios
'dependencies': [
# Runtime dependencies
- '../webkit/plugins/webkit_plugins.gyp:copy_npapi_test_plugin',
+ 'copy_npapi_test_plugin',
],
}],
['enable_webrtc==1', {
@@ -1253,5 +1253,149 @@
},
],
}],
+ ['OS!="android" and OS!="ios"', {
+ # npapi test plugin doesn't build on android or ios
+ 'targets': [
+ {
+ 'target_name': 'npapi_test_plugin',
+ 'type': 'loadable_module',
+ 'variables': {
+ 'chromium_code': 1,
+ },
+ 'mac_bundle': 1,
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'sources': [
+ 'test/plugin/npapi_constants.cc',
+ 'test/plugin/npapi_constants.h',
+ 'test/plugin/npapi_test.cc',
+ 'test/plugin/npapi_test.def',
+ 'test/plugin/npapi_test.rc',
+ 'test/plugin/plugin_arguments_test.cc',
+ 'test/plugin/plugin_arguments_test.h',
+ 'test/plugin/plugin_client.cc',
+ 'test/plugin/plugin_client.h',
+ 'test/plugin/plugin_create_instance_in_paint.cc',
+ 'test/plugin/plugin_create_instance_in_paint.h',
+ 'test/plugin/plugin_delete_plugin_in_deallocate_test.cc',
+ 'test/plugin/plugin_delete_plugin_in_deallocate_test.h',
+ 'test/plugin/plugin_delete_plugin_in_stream_test.cc',
+ 'test/plugin/plugin_delete_plugin_in_stream_test.h',
+ 'test/plugin/plugin_execute_stream_javascript.cc',
+ 'test/plugin/plugin_execute_stream_javascript.h',
+ 'test/plugin/plugin_get_javascript_url_test.cc',
+ 'test/plugin/plugin_get_javascript_url_test.h',
+ 'test/plugin/plugin_get_javascript_url2_test.cc',
+ 'test/plugin/plugin_get_javascript_url2_test.h',
+ 'test/plugin/plugin_geturl_test.cc',
+ 'test/plugin/plugin_geturl_test.h',
+ 'test/plugin/plugin_javascript_open_popup.cc',
+ 'test/plugin/plugin_javascript_open_popup.h',
+ 'test/plugin/plugin_new_fails_test.cc',
+ 'test/plugin/plugin_new_fails_test.h',
+ 'test/plugin/plugin_npobject_identity_test.cc',
+ 'test/plugin/plugin_npobject_identity_test.h',
+ 'test/plugin/plugin_npobject_lifetime_test.cc',
+ 'test/plugin/plugin_npobject_lifetime_test.h',
+ 'test/plugin/plugin_npobject_proxy_test.cc',
+ 'test/plugin/plugin_npobject_proxy_test.h',
+ 'test/plugin/plugin_request_read_test.h',
+ 'test/plugin/plugin_request_read_test.cc',
+ 'test/plugin/plugin_schedule_timer_test.cc',
+ 'test/plugin/plugin_schedule_timer_test.h',
+ 'test/plugin/plugin_setup_test.cc',
+ 'test/plugin/plugin_setup_test.h',
+ 'test/plugin/plugin_test.cc',
+ 'test/plugin/plugin_test.h',
+ 'test/plugin/plugin_test_factory.h',
+ 'test/plugin/plugin_thread_async_call_test.cc',
+ 'test/plugin/plugin_thread_async_call_test.h',
+ 'test/plugin/plugin_windowed_test.cc',
+ 'test/plugin/plugin_windowed_test.h',
+ 'test/plugin/plugin_private_test.cc',
+ 'test/plugin/plugin_private_test.h',
+ 'test/plugin/plugin_test_factory.cc',
+ 'test/plugin/plugin_window_size_test.cc',
+ 'test/plugin/plugin_window_size_test.h',
+ 'test/plugin/plugin_windowless_test.cc',
+ 'test/plugin/plugin_windowless_test.h',
+ 'test/plugin/resource.h',
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'xcode_settings': {
+ 'INFOPLIST_FILE': '<(DEPTH)/content/test/plugin/Info.plist',
+ },
+ 'conditions': [
+ ['OS!="win"', {
+ 'sources!': [
+ # TODO(port): Port these.
+ # plugin_npobject_lifetime_test.cc has win32-isms
+ # (HWND, CALLBACK).
+ 'test/plugin/plugin_npobject_lifetime_test.cc',
+ # The window APIs are necessarily platform-specific.
+ 'test/plugin/plugin_window_size_test.cc',
+ 'test/plugin/plugin_windowed_test.cc',
+ # Seems windows specific.
+ 'test/plugin/plugin_create_instance_in_paint.cc',
+ 'test/plugin/plugin_create_instance_in_paint.h',
+ # windows-specific resources
+ 'test/plugin/npapi_test.def',
+ 'test/plugin/npapi_test.rc',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'product_extension': 'plugin',
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+ ],
+ },
+ }],
+ ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', {
+ # Shared libraries need -fPIC on x86-64
+ 'cflags': ['-fPIC']
+ }],
+ ],
+ },
+ {
+ '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_posix == 1 and OS != "mac"', {
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/plugins',
+ 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
+ },
+ ],
+ }],
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « content/child/npapi/plugin_stream_url.h ('k') | content/test/plugin/Info.plist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698