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

Unified Diff: webkit/default_plugin/default_plugin.gyp

Issue 2079016: Linux: Initial scaffolding for default plugin. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: comments Created 10 years, 7 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 | « chrome/plugin/plugin_thread.cc ('k') | webkit/default_plugin/plugin_impl_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/default_plugin/default_plugin.gyp
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index c353ed961f9cf4eca83851c1017d49848e9a3d5f..3128e72d7407ef3d8fe834de07d937436561c621 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -7,62 +7,63 @@
'chromium_code': 1,
},
'targets': [
- ],
- 'conditions': [
- ['OS=="win" or OS=="mac"', {
- 'targets': [
- {
- 'target_name': 'default_plugin',
- 'type': '<(library)',
- 'dependencies': [
- '../../net/net.gyp:net_resources',
- '../../third_party/icu/icu.gyp:icui18n',
- '../../third_party/icu/icu.gyp:icuuc',
- '../../third_party/libxml/libxml.gyp:libxml',
- '../../third_party/npapi/npapi.gyp:npapi',
- ],
- 'include_dirs': [
- '../..',
- '<(DEPTH)/third_party/wtl/include',
- # TODO(bradnelson): this should fall out of the dependencies.
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
- ],
- 'sources': [
- 'default_plugin_shared.h',
- 'plugin_impl_mac.h',
- 'plugin_impl_mac.mm',
- 'plugin_impl_win.cc',
- 'plugin_impl_win.h',
- 'plugin_main.cc',
- 'plugin_main.h',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- # TODO(thakis): These throw a CircularException on mac.
- # Figure out why once they're needed.
- '../support/webkit_support.gyp:webkit_resources',
- '../support/webkit_support.gyp:webkit_strings',
- ],
- 'msvs_guid': '5916D37D-8C97-424F-A904-74E52594C2D6',
- 'link_settings': {
- 'libraries': ['-lurlmon.lib'],
- },
- 'sources': [
- 'default_plugin.cc',
- 'default_plugin_resources.h',
- 'install_dialog.cc',
- 'install_dialog.h',
- 'plugin_database_handler.cc',
- 'plugin_database_handler.h',
- 'plugin_install_job_monitor.cc',
- 'plugin_install_job_monitor.h',
- ],
- }],
- ],
- },
+ {
+ 'target_name': 'default_plugin',
+ 'type': '<(library)',
+ 'dependencies': [
+ '../../net/net.gyp:net_resources',
+ '../../third_party/icu/icu.gyp:icui18n',
+ '../../third_party/icu/icu.gyp:icuuc',
+ '../../third_party/libxml/libxml.gyp:libxml',
+ '../../third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'include_dirs': [
+ '../..',
+ '<(DEPTH)/third_party/wtl/include',
+ # TODO(bradnelson): this should fall out of the dependencies.
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
+ ],
+ 'sources': [
+ 'default_plugin_shared.h',
+ 'plugin_impl_gtk.cc',
+ 'plugin_impl_gtk.h',
+ 'plugin_impl_mac.h',
+ 'plugin_impl_mac.mm',
+ 'plugin_impl_win.cc',
+ 'plugin_impl_win.h',
+ 'plugin_main.cc',
+ 'plugin_main.h',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ # TODO(thakis): These throw a CircularException on mac.
+ # Figure out why once they're needed.
+ '../support/webkit_support.gyp:webkit_resources',
+ '../support/webkit_support.gyp:webkit_strings',
+ ],
+ 'msvs_guid': '5916D37D-8C97-424F-A904-74E52594C2D6',
+ 'link_settings': {
+ 'libraries': ['-lurlmon.lib'],
+ },
+ 'sources': [
+ 'default_plugin.cc',
+ 'default_plugin_resources.h',
+ 'install_dialog.cc',
+ 'install_dialog.h',
+ 'plugin_database_handler.cc',
+ 'plugin_database_handler.h',
+ 'plugin_install_job_monitor.cc',
+ 'plugin_install_job_monitor.h',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:gtk',
+ ],
+ }],
],
- }],
+ },
],
}
« no previous file with comments | « chrome/plugin/plugin_thread.cc ('k') | webkit/default_plugin/plugin_impl_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698