summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 03:16:53 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 03:16:53 +0000
commit3e682c670b174230ccb819294ee58588a4efaaea (patch)
tree9fa4a97619018b0956d93a2120bbdd3cc14970e9
parenta865e088b426f153d2ff3c7ecc4da9cacc32f3c0 (diff)
downloadchromium_src-3e682c670b174230ccb819294ee58588a4efaaea.zip
chromium_src-3e682c670b174230ccb819294ee58588a4efaaea.tar.gz
chromium_src-3e682c670b174230ccb819294ee58588a4efaaea.tar.bz2
Building of the npapi_test_plugin and npapi_layout_test_plugin.
Builds on Linux, should be readily enableable on Windows. Review URL: http://codereview.chromium.org/40331 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11320 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell.gyp64
1 files changed, 64 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index f520a93..7d68297 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -84,6 +84,8 @@
['OS=="linux"', {
'dependencies': [
'test_shell_resources',
+ 'npapi_layout_test_plugin',
+ 'npapi_test_plugin',
],
# for: test_shell_gtk.cc
'cflags': ['-Wno-multichar'],
@@ -313,5 +315,67 @@
},
],
}],
+ # TODO: change this condition to 'OS!="mac"'
+ # when Windows is ready for the plugins, too.
+ ['OS=="linux"', {
+ 'targets': [
+ {
+ 'target_name': 'npapi_test_plugin',
+ 'type': 'loadable_module',
+ 'product_dir': '<(PRODUCT_DIR)/plugins',
+ 'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../third_party/icu38/icu38.gyp:icuuc',
+ '../../../third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'sources': [
+ '../../glue/plugins/test/npapi_constants.cc',
+ '../../glue/plugins/test/npapi_test.cc',
+ '../../glue/plugins/test/plugin_arguments_test.cc',
+ '../../glue/plugins/test/plugin_client.cc',
+ '../../glue/plugins/test/plugin_delete_plugin_in_stream_test.cc',
+ '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
+ '../../glue/plugins/test/plugin_get_javascript_url_test.cc',
+ '../../glue/plugins/test/plugin_geturl_test.cc',
+ '../../glue/plugins/test/plugin_javascript_open_popup.cc',
+ '../../glue/plugins/test/plugin_new_fails_test.cc',
+ '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+ '../../glue/plugins/test/plugin_npobject_proxy_test.cc',
+ '../../glue/plugins/test/plugin_test.cc',
+ '../../glue/plugins/test/plugin_window_size_test.cc',
+ ],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'sources!': [
+ # TODO(port): Port these.
+ # plugin_client.cc includes not ported headers.
+ # plugin_npobject_lifetime_test.cc has win32-isms
+ # (HWND, CALLBACK).
+ # plugin_window_size_test.cc has w32-isms including HWND.
+ '../../glue/plugins/test/plugin_execute_script_delete_test.cc',
+ '../../glue/plugins/test/plugin_javascript_open_popup.cc',
+ '../../glue/plugins/test/plugin_client.cc',
+ '../../glue/plugins/test/plugin_npobject_lifetime_test.cc',
+ '../../glue/plugins/test/plugin_window_size_test.cc',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'npapi_layout_test_plugin',
+ 'type': 'loadable_module',
+ 'product_dir': '<(PRODUCT_DIR)/plugins',
+ 'sources': [
+ '../npapi_layout_test_plugin/main.cpp',
+ '../npapi_layout_test_plugin/PluginObject.cpp',
+ '../npapi_layout_test_plugin/TestObject.cpp',
+ ],
+ 'dependencies': [
+ '../../../third_party/npapi/npapi.gyp:npapi',
+ '../../webkit.gyp:wtf',
+ ],
+ },
+ ],
+ }],
],
}