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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 14720012: Relanding this as the previous attempt failed due to build errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | « webkit/glue/webkit_glue.cc ('k') | webkit/glue/weburlrequest_extradata_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
===================================================================
--- webkit/glue/webkit_glue.gypi (revision 200310)
+++ webkit/glue/webkit_glue.gypi (working copy)
@@ -54,14 +54,110 @@
],
'includes': [ '../../build/grit_target.gypi' ],
},
+
{
+ 'target_name': 'glue_common',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'defines': [
+ 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
+ 'WEBKIT_GLUE_IMPLEMENTATION',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:base_static',
+ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '<(DEPTH)/ui/ui.gyp:ui_resources',
+ ],
+ 'include_dirs': [
+ '<(INTERMEDIATE_DIR)',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
+ '<(SHARED_INTERMEDIATE_DIR)/ui',
+ ],
+
+ 'sources': [
+ 'multipart_response_delegate.cc',
+ 'multipart_response_delegate.h',
+ 'webcursor.cc',
+ 'webcursor.h',
+ 'webcursor_android.cc',
+ 'webcursor_aura.cc',
+ 'webcursor_aurawin.cc',
+ 'webcursor_aurax11.cc',
+ 'webcursor_null.cc',
+ 'webcursor_gtk.cc',
+ 'webcursor_gtk_data.h',
+ 'webcursor_mac.mm',
+ 'webcursor_win.cc',
+ 'weburlrequest_extradata_impl.cc',
+ 'weburlrequest_extradata_impl.h',
+ 'weburlresponse_extradata_impl.cc',
+ 'weburlresponse_extradata_impl.h',
+ ],
+
+ 'conditions': [
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:gtk',
+ ],
+ 'sources/': [['exclude', '_x11\\.cc$']],
+ 'conditions': [
+ ['linux_use_tcmalloc == 1', {
+ 'dependencies': [
+ # This is needed by ../extensions/v8/heap_profiler_extension.cc
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
+ ['use_aura==1', {
+ 'sources!': [
+ 'webcursor_mac.mm',
+ 'webcursor_win.cc',
+ ],
+ }],
+ ['use_aura==1 and use_x11==1', {
+ 'link_settings': {
+ 'libraries': [ '-lXcursor', ],
+ },
+ }],
+ ['use_ozone==0', {
+ 'sources!': [
+ 'webcursor_null.cc',
+ ],
+ }],
+ ['OS!="mac"', {
+ 'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+ }, { # else: OS=="mac"
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
+ ],
+ },
+ }],
+ ['OS!="win"', {
+ 'sources/': [['exclude', '_win\\.cc$']],
+ }, { # else: OS=="win"
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4800, 4267 ],
+ 'sources/': [['exclude', '_posix\\.cc$']],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/wtl/include',
+ ],
+ }],
+ ],
+ },
+
+ {
'target_name': 'glue',
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines': [
'WEBKIT_EXTENSIONS_IMPLEMENTATION',
'WEBKIT_GLUE_IMPLEMENTATION',
- 'WEBKIT_PLUGINS_IMPLEMENTATION',
],
'dependencies': [
'<(DEPTH)/base/base.gyp:base_i18n',
@@ -70,11 +166,7 @@
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
'<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
- '<(DEPTH)/media/media.gyp:media',
- '<(DEPTH)/media/media.gyp:shared_memory_support',
'<(DEPTH)/net/net.gyp:net',
- '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
- '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -87,6 +179,9 @@
'<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
'<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
+ 'glue_common',
+ 'plugins_common',
+ 'plugins',
'user_agent',
'webkit_base',
'webkit_media',
@@ -100,155 +195,6 @@
'<(SHARED_INTERMEDIATE_DIR)/ui',
],
'sources': [
- # This list contains all .h, .cc, and .mm files in glue except for
- # those in the test subdirectory and those with unittest in in their
- # names.
- '../plugins/npapi/gtk_plugin_container.cc',
- '../plugins/npapi/gtk_plugin_container.h',
- '../plugins/npapi/gtk_plugin_container_manager.cc',
- '../plugins/npapi/gtk_plugin_container_manager.h',
- '../plugins/npapi/plugin_constants_win.cc',
- '../plugins/npapi/plugin_constants_win.h',
- '../plugins/npapi/plugin_host.cc',
- '../plugins/npapi/plugin_host.h',
- '../plugins/npapi/plugin_instance.cc',
- '../plugins/npapi/plugin_instance.h',
- '../plugins/npapi/plugin_instance_mac.mm',
- '../plugins/npapi/plugin_lib.cc',
- '../plugins/npapi/plugin_lib.h',
- '../plugins/npapi/plugin_lib_mac.mm',
- '../plugins/npapi/plugin_lib_posix.cc',
- '../plugins/npapi/plugin_lib_win.cc',
- '../plugins/npapi/plugin_list.cc',
- '../plugins/npapi/plugin_list.h',
- '../plugins/npapi/plugin_list_mac.mm',
- '../plugins/npapi/plugin_list_posix.cc',
- '../plugins/npapi/plugin_list_win.cc',
- '../plugins/npapi/plugin_stream.cc',
- '../plugins/npapi/plugin_stream.h',
- '../plugins/npapi/plugin_stream_posix.cc',
- '../plugins/npapi/plugin_stream_url.cc',
- '../plugins/npapi/plugin_stream_url.h',
- '../plugins/npapi/plugin_stream_win.cc',
- '../plugins/npapi/plugin_string_stream.cc',
- '../plugins/npapi/plugin_string_stream.h',
- '../plugins/npapi/plugin_utils.cc',
- '../plugins/npapi/plugin_utils.h',
- '../plugins/npapi/plugin_web_event_converter_mac.h',
- '../plugins/npapi/plugin_web_event_converter_mac.mm',
- '../plugins/npapi/webplugin.cc',
- '../plugins/npapi/webplugin.h',
- '../plugins/npapi/webplugin_accelerated_surface_mac.h',
- '../plugins/npapi/webplugin_delegate.h',
- '../plugins/npapi/webplugin_delegate_impl.cc',
- '../plugins/npapi/webplugin_delegate_impl.h',
- '../plugins/npapi/webplugin_delegate_impl_android.cc',
- '../plugins/npapi/webplugin_delegate_impl_aura.cc',
- '../plugins/npapi/webplugin_delegate_impl_gtk.cc',
- '../plugins/npapi/webplugin_delegate_impl_mac.mm',
- '../plugins/npapi/webplugin_delegate_impl_win.cc',
- '../plugins/npapi/webplugin_ime_win.cc',
- '../plugins/npapi/webplugin_ime_win.h',
- '../plugins/npapi/webplugin_impl.cc',
- '../plugins/npapi/webplugin_impl.h',
- '../plugins/plugin_constants.cc',
- '../plugins/plugin_constants.h',
- '../plugins/plugin_switches.cc',
- '../plugins/plugin_switches.h',
- '../plugins/ppapi/audio_helper.cc',
- '../plugins/ppapi/audio_helper.h',
- '../plugins/ppapi/common.h',
- '../plugins/ppapi/content_decryptor_delegate.cc',
- '../plugins/ppapi/content_decryptor_delegate.h',
- '../plugins/ppapi/event_conversion.cc',
- '../plugins/ppapi/event_conversion.h',
- '../plugins/ppapi/file_callbacks.cc',
- '../plugins/ppapi/file_callbacks.h',
- '../plugins/ppapi/fullscreen_container.h',
- '../plugins/ppapi/gfx_conversion.h',
- '../plugins/ppapi/host_array_buffer_var.cc',
- '../plugins/ppapi/host_array_buffer_var.h',
- '../plugins/ppapi/host_globals.cc',
- '../plugins/ppapi/host_globals.h',
- '../plugins/ppapi/host_var_tracker.cc',
- '../plugins/ppapi/host_var_tracker.h',
- '../plugins/ppapi/message_channel.cc',
- '../plugins/ppapi/message_channel.h',
- '../plugins/ppapi/npapi_glue.cc',
- '../plugins/ppapi/npapi_glue.h',
- '../plugins/ppapi/npobject_var.cc',
- '../plugins/ppapi/npobject_var.h',
- '../plugins/ppapi/plugin_delegate.h',
- '../plugins/ppapi/plugin_module.cc',
- '../plugins/ppapi/plugin_module.h',
- '../plugins/ppapi/plugin_object.cc',
- '../plugins/ppapi/plugin_object.h',
- '../plugins/ppapi/ppapi_interface_factory.cc',
- '../plugins/ppapi/ppapi_interface_factory.h',
- '../plugins/ppapi/ppapi_plugin_instance.cc',
- '../plugins/ppapi/ppapi_plugin_instance.h',
- '../plugins/ppapi/ppapi_webplugin_impl.cc',
- '../plugins/ppapi/ppapi_webplugin_impl.h',
- '../plugins/ppapi/ppb_audio_impl.cc',
- '../plugins/ppapi/ppb_audio_impl.h',
- '../plugins/ppapi/ppb_broker_impl.cc',
- '../plugins/ppapi/ppb_broker_impl.h',
- '../plugins/ppapi/ppb_buffer_impl.cc',
- '../plugins/ppapi/ppb_buffer_impl.h',
- '../plugins/ppapi/ppb_file_ref_impl.cc',
- '../plugins/ppapi/ppb_file_ref_impl.h',
- '../plugins/ppapi/ppb_flash_message_loop_impl.cc',
- '../plugins/ppapi/ppb_flash_message_loop_impl.h',
- '../plugins/ppapi/ppb_gpu_blacklist_private_impl.cc',
- '../plugins/ppapi/ppb_gpu_blacklist_private_impl.h',
- '../plugins/ppapi/ppb_graphics_3d_impl.cc',
- '../plugins/ppapi/ppb_graphics_3d_impl.h',
- '../plugins/ppapi/ppb_image_data_impl.cc',
- '../plugins/ppapi/ppb_image_data_impl.h',
- '../plugins/ppapi/ppb_network_monitor_private_impl.cc',
- '../plugins/ppapi/ppb_network_monitor_private_impl.h',
- '../plugins/ppapi/ppb_proxy_impl.cc',
- '../plugins/ppapi/ppb_proxy_impl.h',
- '../plugins/ppapi/ppb_scrollbar_impl.cc',
- '../plugins/ppapi/ppb_scrollbar_impl.h',
- '../plugins/ppapi/ppb_tcp_server_socket_private_impl.cc',
- '../plugins/ppapi/ppb_tcp_server_socket_private_impl.h',
- '../plugins/ppapi/ppb_tcp_socket_private_impl.cc',
- '../plugins/ppapi/ppb_tcp_socket_private_impl.h',
- '../plugins/ppapi/ppb_uma_private_impl.cc',
- '../plugins/ppapi/ppb_uma_private_impl.h',
- '../plugins/ppapi/ppb_url_loader_impl.cc',
- '../plugins/ppapi/ppb_url_loader_impl.h',
- '../plugins/ppapi/ppb_var_deprecated_impl.cc',
- '../plugins/ppapi/ppb_var_deprecated_impl.h',
- '../plugins/ppapi/ppb_video_decoder_impl.cc',
- '../plugins/ppapi/ppb_video_decoder_impl.h',
- '../plugins/ppapi/ppb_widget_impl.cc',
- '../plugins/ppapi/ppb_widget_impl.h',
- '../plugins/ppapi/ppb_x509_certificate_private_impl.cc',
- '../plugins/ppapi/ppb_x509_certificate_private_impl.h',
- '../plugins/ppapi/quota_file_io.cc',
- '../plugins/ppapi/quota_file_io.h',
- '../plugins/ppapi/resource_creation_impl.cc',
- '../plugins/ppapi/resource_creation_impl.h',
- '../plugins/ppapi/resource_helper.cc',
- '../plugins/ppapi/resource_helper.h',
- '../plugins/ppapi/string.cc',
- '../plugins/ppapi/string.h',
- '../plugins/ppapi/url_response_info_util.cc',
- '../plugins/ppapi/url_response_info_util.h',
- '../plugins/ppapi/url_request_info_util.cc',
- '../plugins/ppapi/url_request_info_util.h',
- '../plugins/ppapi/usb_key_code_conversion.h',
- '../plugins/ppapi/usb_key_code_conversion.cc',
- '../plugins/ppapi/usb_key_code_conversion_linux.cc',
- '../plugins/ppapi/usb_key_code_conversion_mac.cc',
- '../plugins/ppapi/usb_key_code_conversion_win.cc',
- '../plugins/sad_plugin.cc',
- '../plugins/sad_plugin.h',
- '../plugins/webkit_plugins_export.h',
- '../plugins/webplugininfo.cc',
- '../plugins/webplugininfo.h',
'cpp_bound_class.cc',
'cpp_bound_class.h',
'cpp_variant.cc',
@@ -263,8 +209,6 @@
'glue_serialize.h',
'image_decoder.cc',
'image_decoder.h',
- 'multipart_response_delegate.cc',
- 'multipart_response_delegate.h',
'network_list_observer.h',
'npruntime_util.cc',
'npruntime_util.h',
@@ -286,17 +230,6 @@
'webclipboard_impl.h',
'webcookie.cc',
'webcookie.h',
- 'webcursor.cc',
- 'webcursor.h',
- 'webcursor_android.cc',
- 'webcursor_aura.cc',
- 'webcursor_aurawin.cc',
- 'webcursor_aurax11.cc',
- 'webcursor_null.cc',
- 'webcursor_gtk.cc',
- 'webcursor_gtk_data.h',
- 'webcursor_mac.mm',
- 'webcursor_win.cc',
'webdropdata.cc',
'webdropdata_win.cc',
'webdropdata.h',
@@ -329,10 +262,6 @@
'webthread_impl.cc',
'weburlloader_impl.cc',
'weburlloader_impl.h',
- 'weburlrequest_extradata_impl.cc',
- 'weburlrequest_extradata_impl.h',
- 'weburlresponse_extradata_impl.cc',
- 'weburlresponse_extradata_impl.h',
'web_io_operators.cc',
'web_io_operators.h',
'worker_task_runner.cc',
@@ -359,34 +288,12 @@
'<(DEPTH)/build/linux/system.gyp:gtk',
],
'sources/': [['exclude', '_x11\\.cc$']],
- 'sources!': [
- 'plugins/plugin_stubs.cc',
- ],
}],
- ['use_aura==1', {
- 'sources/': [
- ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_mac.mm'],
- ],
- 'sources!': [
- 'webcursor_mac.mm',
- 'webcursor_win.cc',
- ],
- }],
['use_aura==1 and use_x11==1', {
'link_settings': {
'libraries': [ '-lXcursor', ],
},
}],
- ['use_ozone==0', {
- 'sources!': [
- 'webcursor_null.cc',
- ],
- }],
- ['use_aura==1 and OS=="win"', {
- 'sources/': [
- ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_aura'],
- ],
- }],
['OS!="mac"', {
'sources/': [['exclude', '_mac\\.(cc|mm)$']],
'sources!': [
@@ -400,13 +307,6 @@
],
},
}],
- ['enable_gpu!=1', {
- 'sources!': [
- '../plugins/ppapi/ppb_graphics_3d_impl.cc',
- '../plugins/ppapi/ppb_graphics_3d_impl.h',
- '../plugins/ppapi/ppb_open_gl_es_impl.cc',
- ],
- }],
['OS!="win"', {
'sources/': [['exclude', '_win\\.cc$']],
'sources!': [
@@ -417,9 +317,6 @@
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
- 'sources!': [
- 'plugins/plugin_stubs.cc',
- ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4800, 4267 ],
'conditions': [
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/glue/weburlrequest_extradata_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698