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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/ui.gyp

Issue 7328011: Introduce ui.dll / libui.so for the component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
« build/common.gypi ('K') | « ui/gfx/win_util.h ('k') | ui/ui_api.h » ('j') | webkit/support/webkit_support_gfx.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
===================================================================
--- ui/ui.gyp (revision 92566)
+++ ui/ui.gyp (working copy)
@@ -25,10 +25,396 @@
],
},
'includes': [
- 'ui_base.gypi',
- 'ui_gfx.gypi',
'ui_resources.gypi',
],
+ 'targets': [
+ {
+ 'target_name': 'ui',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../base/base.gyp:base_static',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+ '../third_party/libpng/libpng.gyp:libpng',
+ '../third_party/zlib/zlib.gyp:zlib',
+ 'base/strings/ui_strings.gyp:ui_strings',
+ 'gfx_resources',
+ '<(libjpeg_gyp_path):libjpeg',
+ ],
+ # Export these dependencies since text_elider.h includes ICU headers.
+ 'export_dependent_settings': [
+ '../net/net.gyp:net',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+ ],
+ 'sources': [
+ 'base/accessibility/accessibility_types.h',
+ 'base/accessibility/accessible_view_state.cc',
+ 'base/accessibility/accessible_view_state.h',
+ 'base/animation/animation.cc',
+ 'base/animation/animation.h',
+ 'base/animation/animation_container.cc',
+ 'base/animation/animation_container.h',
+ 'base/animation/animation_container_element.h',
+ 'base/animation/animation_container_observer.h',
+ 'base/animation/animation_delegate.h',
+ 'base/animation/linear_animation.cc',
+ 'base/animation/linear_animation.h',
+ 'base/animation/multi_animation.cc',
+ 'base/animation/multi_animation.h',
+ 'base/animation/slide_animation.cc',
+ 'base/animation/slide_animation.h',
+ 'base/animation/throb_animation.cc',
+ 'base/animation/throb_animation.h',
+ 'base/animation/tween.cc',
+ 'base/animation/tween.h',
+ 'base/clipboard/clipboard.cc',
+ 'base/clipboard/clipboard.h',
+ 'base/clipboard/clipboard_linux.cc',
+ 'base/clipboard/clipboard_mac.mm',
+ 'base/clipboard/clipboard_util_win.cc',
+ 'base/clipboard/clipboard_util_win.h',
+ 'base/clipboard/clipboard_win.cc',
+ 'base/clipboard/scoped_clipboard_writer.cc',
+ 'base/clipboard/scoped_clipboard_writer.h',
+ 'base/dragdrop/drag_drop_types_gtk.cc',
+ 'base/dragdrop/drag_drop_types.h',
+ 'base/dragdrop/drag_drop_types_win.cc',
+ 'base/dragdrop/drag_source.cc',
+ 'base/dragdrop/drag_source.h',
+ 'base/dragdrop/drop_target.cc',
+ 'base/dragdrop/drop_target.h',
+ 'base/dragdrop/gtk_dnd_util.cc',
+ 'base/dragdrop/gtk_dnd_util.h',
+ 'base/dragdrop/os_exchange_data.cc',
+ 'base/dragdrop/os_exchange_data.h',
+ 'base/dragdrop/os_exchange_data_provider_gtk.cc',
+ 'base/dragdrop/os_exchange_data_provider_gtk.h',
+ 'base/dragdrop/os_exchange_data_provider_win.cc',
+ 'base/dragdrop/os_exchange_data_provider_win.h',
+ 'base/events.h',
+ 'base/gtk/event_synthesis_gtk.cc',
+ 'base/gtk/event_synthesis_gtk.h',
+ 'base/gtk/g_object_destructor_filo.cc',
+ 'base/gtk/g_object_destructor_filo.h',
+ 'base/gtk/gtk_im_context_util.cc',
+ 'base/gtk/gtk_im_context_util.h',
+ 'base/gtk/gtk_signal.h',
+ 'base/gtk/gtk_signal_registrar.cc',
+ 'base/gtk/gtk_signal_registrar.h',
+ 'base/gtk/gtk_windowing.cc',
+ 'base/gtk/gtk_windowing.h',
+ 'base/ime/composition_text.cc',
+ 'base/ime/composition_text.h',
+ 'base/ime/composition_underline.h',
+ 'base/ime/text_input_type.h',
+ 'base/keycodes/keyboard_code_conversion_gtk.cc',
+ 'base/keycodes/keyboard_code_conversion_gtk.h',
+ 'base/keycodes/keyboard_code_conversion_mac.h',
+ 'base/keycodes/keyboard_code_conversion_mac.mm',
+ 'base/keycodes/keyboard_code_conversion_win.cc',
+ 'base/keycodes/keyboard_code_conversion_win.h',
+ 'base/keycodes/keyboard_code_conversion_x.cc',
+ 'base/keycodes/keyboard_code_conversion_x.h',
+ 'base/keycodes/keyboard_codes.h',
+ 'base/l10n/l10n_font_util.cc',
+ 'base/l10n/l10n_font_util.h',
+ 'base/l10n/l10n_util.cc',
+ 'base/l10n/l10n_util.h',
+ 'base/l10n/l10n_util_collator.h',
+ 'base/l10n/l10n_util_mac.h',
+ 'base/l10n/l10n_util_mac.mm',
+ 'base/l10n/l10n_util_posix.cc',
+ 'base/l10n/l10n_util_win.cc',
+ 'base/l10n/l10n_util_win.h',
+ 'base/message_box_flags.h',
+ 'base/message_box_win.cc',
+ 'base/message_box_win.h',
+ 'base/models/accelerator_cocoa.h',
+ 'base/models/accelerator_cocoa.mm',
+ 'base/models/accelerator_gtk.h',
+ 'base/models/accelerator.h',
+ 'base/models/button_menu_item_model.cc',
+ 'base/models/button_menu_item_model.h',
+ 'base/models/combobox_model.h',
+ 'base/models/menu_model.cc',
+ 'base/models/menu_model.h',
+ 'base/models/menu_model_delegate.h',
+ 'base/models/simple_menu_model.cc',
+ 'base/models/simple_menu_model.h',
+ 'base/models/table_model.cc',
+ 'base/models/table_model.h',
+ 'base/models/table_model_observer.h',
+ 'base/models/tree_model.cc',
+ 'base/models/tree_model.h',
+ 'base/models/tree_node_iterator.h',
+ 'base/models/tree_node_model.h',
+ 'base/range/range.cc',
+ 'base/range/range.h',
+ 'base/range/range_mac.mm',
+ 'base/range/range_win.cc',
+ 'base/resource/data_pack.cc',
+ 'base/resource/data_pack.h',
+ 'base/resource/resource_bundle.cc',
+ 'base/resource/resource_bundle.h',
+ 'base/resource/resource_bundle_linux.cc',
+ 'base/resource/resource_bundle_mac.mm',
+ 'base/resource/resource_bundle_posix.cc',
+ 'base/resource/resource_bundle_win.cc',
+ 'base/text/bytes_formatting.cc',
+ 'base/text/bytes_formatting.h',
+ 'base/text/text_elider.cc',
+ 'base/text/text_elider.h',
+ 'base/theme_provider.cc',
+ 'base/theme_provider.h',
+ 'base/ui_base_paths.cc',
+ 'base/ui_base_paths.h',
+ 'base/ui_base_switches.cc',
+ 'base/ui_base_switches.h',
+ 'base/view_prop.cc',
+ 'base/view_prop.h',
+ 'base/win/hwnd_util.cc',
+ 'base/win/hwnd_util.h',
+ 'base/win/ime_input.cc',
+ 'base/win/ime_input.h',
+ 'base/win/shell.cc',
+ 'base/win/shell.h',
+ 'base/win/window_impl.cc',
+ 'base/win/window_impl.h',
+ 'base/x/active_window_watcher_x.cc',
+ 'base/x/active_window_watcher_x.h',
+ 'base/x/x11_util.cc',
+ 'base/x/x11_util.h',
+ 'base/x/x11_util_internal.h',
+ 'gfx/blit.cc',
+ 'gfx/blit.h',
+ 'gfx/brush.h',
+ 'gfx/canvas.cc',
+ 'gfx/canvas.h',
+ 'gfx/canvas_skia.h',
+ 'gfx/canvas_skia.cc',
+ 'gfx/canvas_skia_linux.cc',
+ 'gfx/canvas_skia_mac.mm',
+ 'gfx/canvas_skia_paint.h',
+ 'gfx/canvas_skia_win.cc',
+ 'gfx/codec/jpeg_codec.cc',
+ 'gfx/codec/jpeg_codec.h',
+ 'gfx/codec/png_codec.cc',
+ 'gfx/codec/png_codec.h',
+ 'gfx/color_analysis.cc',
+ 'gfx/color_analysis.h',
+ 'gfx/color_utils.cc',
+ 'gfx/color_utils.h',
+ 'gfx/favicon_size.h',
+ 'gfx/font.h',
+ 'gfx/font.cc',
+ 'gfx/gfx_paths.cc',
+ 'gfx/gfx_paths.h',
+ 'gfx/image/image.cc',
+ 'gfx/image/image.h',
+ 'gfx/image/image_mac.mm',
+ 'gfx/image/image_util.cc',
+ 'gfx/image/image_util.h',
+ 'gfx/insets.cc',
+ 'gfx/insets.h',
+ 'gfx/interpolated_transform.h',
+ 'gfx/interpolated_transform.cc',
+ 'gfx/mac/nsimage_cache.h',
+ 'gfx/mac/nsimage_cache.mm',
+ 'gfx/mac/scoped_ns_disable_screen_updates.h',
+ 'gfx/native_theme.cc',
+ 'gfx/native_theme.h',
+ 'gfx/native_widget_types.h',
+ 'gfx/path.cc',
+ 'gfx/path.h',
+ 'gfx/path_gtk.cc',
+ 'gfx/path_win.cc',
+ 'gfx/platform_font.h',
+ 'gfx/platform_font_gtk.h',
+ 'gfx/platform_font_gtk.cc',
+ 'gfx/platform_font_mac.h',
+ 'gfx/platform_font_mac.mm',
+ 'gfx/platform_font_win.h',
+ 'gfx/platform_font_win.cc',
+ 'gfx/point.cc',
+ 'gfx/point.h',
+ 'gfx/rect.cc',
+ 'gfx/rect.h',
+ 'gfx/scoped_cg_context_save_gstate_mac.h',
+ 'gfx/scoped_ns_graphics_context_save_gstate_mac.h',
+ 'gfx/scoped_ns_graphics_context_save_gstate_mac.mm',
+ 'gfx/scrollbar_size.cc',
+ 'gfx/scrollbar_size.h',
+ 'gfx/size.cc',
+ 'gfx/size.h',
+ 'gfx/skbitmap_operations.cc',
+ 'gfx/skbitmap_operations.h',
+ 'gfx/skia_util.cc',
+ 'gfx/skia_util.h',
+ 'gfx/skia_utils_gtk.cc',
+ 'gfx/skia_utils_gtk.h',
+ 'gfx/transform.h',
+ 'gfx/transform.cc',
+ ],
+ 'conditions': [
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ # font_gtk.cc uses fontconfig.
+ # TODO(evanm): I think this is wrong; it should just use GTK.
+ '../build/linux/system.gyp:fontconfig',
+ '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:x11',
+ '../build/linux/system.gyp:xext',
+ ],
+ 'sources': [
+ 'gfx/gtk_native_view_id_manager.cc',
+ 'gfx/gtk_native_view_id_manager.h',
+ 'gfx/gtk_preserve_window.cc',
+ 'gfx/gtk_preserve_window.h',
+ 'gfx/gtk_util.cc',
+ 'gfx/gtk_util.h',
+ 'gfx/native_theme_linux.cc',
+ 'gfx/native_theme_linux.h',
+ 'gfx/native_widget_types_gtk.cc',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lXrender', # For XRender* function calls in x11_util.cc.
+ ],
+ },
+ 'conditions': [
+ ['toolkit_views==0', {
+ # Note: because of gyp predence rules this has to be defined as
+ # 'sources/' rather than 'sources!'.
+ 'sources/': [
+ ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
+ ['exclude', '^base/dragdrop/os_exchange_data.cc'],
+ ['exclude', '^base/dragdrop/os_exchange_data.h'],
+ ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.cc'],
+ ['exclude', '^base/dragdrop/os_exchange_data_provider_gtk.h'],
+ ],
+ }, {
+ # Note: because of gyp predence rules this has to be defined as
+ # 'sources/' rather than 'sources!'.
+ 'sources/': [
+ ['include', '^base/dragdrop/os_exchange_data.cc'],
+ ],
+ }],
+ ],
+ }],
+ ['OS=="win"', {
+ 'sources': [
+ 'gfx/canvas_direct2d.cc',
+ 'gfx/canvas_direct2d.h',
+ 'gfx/gdi_util.cc',
+ 'gfx/gdi_util.h',
+ 'gfx/icon_util.cc',
+ 'gfx/icon_util.h',
+ 'gfx/native_theme_win.cc',
+ 'gfx/native_theme_win.h',
+ 'gfx/win_util.cc',
+ 'gfx/win_util.h',
+ ],
+ 'include_dirs': [
+ '../',
+ '../third_party/wtl/include',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'd2d1.dll',
+ 'd3d10_1.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'd2d1.lib',
+ 'd3d10_1.lib',
+ ],
+ },
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-limm32.lib',
+ '-loleacc.lib',
+ ],
+ },
+ },{ # OS!="win"
+ 'sources!': [
+ 'base/dragdrop/drag_source.cc',
+ 'base/dragdrop/drag_source.h',
+ 'base/dragdrop/drag_drop_types.h',
+ 'base/dragdrop/drop_target.cc',
+ 'base/dragdrop/drop_target.h',
+ 'base/dragdrop/os_exchange_data.cc',
+ 'base/view_prop.cc',
+ 'base/view_prop.h',
+ ],
+ 'sources/': [
+ ['exclude', '^base/win/*'],
+ ],
+ }],
+ ['component == "shared_library"', {
+ 'defines': [
+ 'UI_IMPLEMENTATION',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
+ '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
+ ],
+ },
+ }],
+ ['use_x11==1', {
+ 'all_dependent_settings': {
+ 'ldflags': [
+ '-L<(PRODUCT_DIR)',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lX11',
+ '-ldl',
+ ],
+ },
+ },
+ }, { # use_x11==0
+ 'sources!': [
+ 'base/keycodes/keyboard_code_conversion_x.cc',
+ 'base/keycodes/keyboard_code_conversion_x.h',
+ ],
+ }],
+ ['chromeos==1', {
+ 'sources': [
+ 'gfx/native_theme_chromeos.cc',
+ 'gfx/native_theme_chromeos.h',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'gfx_resources',
+ 'type': 'none',
+ 'variables': {
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx',
+ },
+ 'actions': [
+ {
+ 'action_name': 'gfx_resources',
+ 'variables': {
+ 'grit_grd_file': 'gfx/gfx_resources.grd',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
+ ],
+ 'includes': [ '../build/grit_target.gypi' ],
+ },
+ ],
'conditions': [
['toolkit_views2==1', {
'includes': [
@@ -39,6 +425,71 @@
'includes': [
'ui_unittests.gypi',
],
+ 'targets': [
+ {
+ # TODO(rsesek): Remove this target once ui_unittests is run on the
+ # waterfall instead of gfx_unittests.
+ 'target_name': 'gfx_unittests',
+ 'type': 'none',
+ 'dependencies': [
+ 'ui_unittests',
+ ],
+ 'actions': [
+ {
+ 'message': 'TEMPORARY: Copying ui_unittests to gfx_unittests',
+ 'variables': {
+ 'ui_copy_target': '<(PRODUCT_DIR)/ui_unittests<(EXECUTABLE_SUFFIX)',
+ 'ui_copy_dest': '<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
+ },
+ 'inputs': ['<(ui_copy_target)'],
+ 'outputs': ['<(ui_copy_dest)'],
+ 'action_name': 'TEMP_copy_ui_unittests',
+ 'action': [
+ 'python', '-c',
+ 'import os, shutil; ' \
+ 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
+ 'os.chmod(\'<(ui_copy_dest)\', 0700)'
+ ]
+ }
+ ],
+ },
+ ],
}],
+ ['OS=="win"', {
+ 'targets': [
+ {
+ 'target_name': 'ui_nacl_win64',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../base/base.gyp:base_nacl_win64',
+ ],
+ 'defines': [
+ '<@(nacl_win64_defines)',
+ ],
+ 'sources': [
+ 'base/resource/resource_bundle_dummy.cc',
+ 'base/ui_base_paths.h',
+ 'base/ui_base_paths.cc',
+ 'base/ui_base_switches.h',
+ 'base/ui_base_switches.cc',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_target_platform': 'x64',
+ },
+ },
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'defines': [
+ 'UI_IMPLEMENTATION',
+ ],
+ }],
+ ],
+ },
+ ],
+ }],
],
}
« build/common.gypi ('K') | « ui/gfx/win_util.h ('k') | ui/ui_api.h » ('j') | webkit/support/webkit_support_gfx.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698