diff options
Diffstat (limited to 'chromium/ui/aura/aura.gyp')
| -rw-r--r-- | chromium/ui/aura/aura.gyp | 150 |
1 files changed, 81 insertions, 69 deletions
diff --git a/chromium/ui/aura/aura.gyp b/chromium/ui/aura/aura.gyp index 68164d4321a..56ef7987b44 100644 --- a/chromium/ui/aura/aura.gyp +++ b/chromium/ui/aura/aura.gyp @@ -14,28 +14,19 @@ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../cc/cc.gyp:cc', - '../../gpu/gpu.gyp:gpu', '../../skia/skia.gyp:skia', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../events/events.gyp:events', '../events/events.gyp:events_base', + '../events/platform/events_platform.gyp:events_platform', '../gfx/gfx.gyp:gfx', - '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', + '../gfx/gfx.gyp:gfx_geometry', ], 'defines': [ 'AURA_IMPLEMENTATION', ], 'sources': [ - 'client/activation_change_observer.h', - 'client/activation_change_observer.cc', - 'client/activation_client.cc', - 'client/activation_client.h', - 'client/activation_delegate.cc', - 'client/activation_delegate.h', - 'client/animation_host.cc', - 'client/animation_host.h', 'client/aura_constants.cc', 'client/aura_constants.h', 'client/capture_client.cc', @@ -45,16 +36,8 @@ 'client/cursor_client.h', 'client/cursor_client_observer.h', 'client/cursor_client_observer.cc', - 'client/default_activation_client.cc', - 'client/default_activation_client.h', 'client/default_capture_client.cc', 'client/default_capture_client.h', - 'client/dispatcher_client.cc', - 'client/dispatcher_client.h', - 'client/drag_drop_client.cc', - 'client/drag_drop_client.h', - 'client/drag_drop_delegate.cc', - 'client/drag_drop_delegate.h', 'client/event_client.cc', 'client/event_client.h', 'client/focus_change_observer.cc', @@ -63,22 +46,12 @@ 'client/focus_client.h', 'client/screen_position_client.cc', 'client/screen_position_client.h', - 'client/tooltip_client.cc', - 'client/tooltip_client.h', - 'client/user_action_client.cc', - 'client/user_action_client.h', 'client/visibility_client.cc', 'client/visibility_client.h', - 'client/window_move_client.cc', - 'client/window_move_client.h', 'client/window_stacking_client.cc', 'client/window_stacking_client.h', 'client/window_tree_client.cc', 'client/window_tree_client.h', - 'client/window_types.h', - 'device_list_updater_aurax11.cc', - 'device_list_updater_aurax11.h', - 'dispatcher_win.cc', 'env.cc', 'env.h', 'env_observer.h', @@ -88,40 +61,64 @@ 'input_state_lookup_win.h', 'layout_manager.cc', 'layout_manager.h', - 'remote_root_window_host_win.cc', - 'remote_root_window_host_win.h', - 'root_window_host_ozone.cc', - 'root_window_host_ozone.h', - 'root_window_host_win.cc', - 'root_window_host_win.h', - 'root_window_host_x11.cc', - 'root_window_host_x11.h', - 'root_window_transformer.h', - 'root_window.cc', - 'root_window.h', + 'remote_window_tree_host_win.cc', + 'remote_window_tree_host_win.h', + 'scoped_window_targeter.cc', + 'scoped_window_targeter.h', 'window.cc', 'window.h', - 'window_targeter.cc', - 'window_targeter.h', + 'window_event_dispatcher.cc', + 'window_event_dispatcher.h', 'window_delegate.h', 'window_layer_type.h', + 'window_observer.cc', 'window_observer.h', + 'window_targeter.cc', + 'window_targeter.h', 'window_tracker.cc', 'window_tracker.h', 'window_tree_host.cc', 'window_tree_host.h', - 'window_tree_host_delegate.h', + 'window_tree_host_mac.mm', + 'window_tree_host_mac.h', + 'window_tree_host_observer.h', + 'window_tree_host_ozone.cc', + 'window_tree_host_ozone.h', + 'window_tree_host_win.cc', + 'window_tree_host_win.h', + 'window_tree_host_x11.cc', + 'window_tree_host_x11.h', + '../wm/public/activation_change_observer.h', + '../wm/public/activation_change_observer.cc', + '../wm/public/activation_client.cc', + '../wm/public/activation_client.h', + '../wm/public/activation_delegate.cc', + '../wm/public/activation_delegate.h', + '../wm/public/animation_host.cc', + '../wm/public/animation_host.h', + '../wm/public/dispatcher_client.cc', + '../wm/public/dispatcher_client.h', + '../wm/public/drag_drop_client.cc', + '../wm/public/drag_drop_client.h', + '../wm/public/drag_drop_delegate.cc', + '../wm/public/drag_drop_delegate.h', + '../wm/public/scoped_tooltip_disabler.cc', + '../wm/public/scoped_tooltip_disabler.h', + '../wm/public/tooltip_client.cc', + '../wm/public/tooltip_client.h', + '../wm/public/transient_window_client.cc', + '../wm/public/transient_window_client.h', + '../wm/public/window_move_client.cc', + '../wm/public/window_move_client.h', ], 'conditions': [ ['use_x11==1', { - 'link_settings': { - 'libraries': [ - '-lX11', - '-lXi', - '-lXfixes', - '-lXrandr', - ], - }, + 'dependencies': [ + '../../build/linux/system.gyp:x11', + '../../build/linux/system.gyp:xrandr', + '../../build/linux/system.gyp:xi', + '../events/platform/x11/x11_events_platform.gyp:x11_events_platform', + ], }], ['OS=="win"', { 'dependencies': [ @@ -134,6 +131,7 @@ }], ['use_ozone==1', { 'dependencies': [ + '../events/ozone/events_ozone.gyp:events_ozone', '../ozone/ozone.gyp:ozone', ], }], @@ -145,13 +143,14 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', + '../base/ui_base.gyp:ui_base_test_support', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../events/events.gyp:events_base', '../events/events.gyp:events_test_support', '../gfx/gfx.gyp:gfx', - '../ui.gyp:ui', - '../ui_unittests.gyp:ui_test_support', + '../gfx/gfx.gyp:gfx_geometry', 'aura', ], 'include_dirs': [ @@ -162,13 +161,13 @@ 'test/aura_test_base.h', 'test/aura_test_helper.cc', 'test/aura_test_helper.h', + 'test/aura_test_utils.cc', + 'test/aura_test_utils.h', 'test/env_test_helper.h', 'test/event_generator.cc', 'test/event_generator.h', 'test/test_cursor_client.cc', 'test/test_cursor_client.h', - 'test/test_event_handler.cc', - 'test/test_event_handler.h', 'test/test_focus_client.cc', 'test/test_focus_client.h', 'test/test_screen.cc', @@ -197,12 +196,12 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', - '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', + '../gfx/gfx.gyp:gfx_geometry', 'aura', 'aura_test_support', ], @@ -212,6 +211,13 @@ 'sources': [ 'demo/demo_main.cc', ], + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ + '../gfx/x/gfx_x11.gyp:gfx_x11', + ], + }], + ] }, { 'target_name': 'aura_bench', @@ -219,15 +225,17 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', + '../../cc/cc.gyp:cc', + '../../gpu/gpu.gyp:gles2_implementation', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', + '../base/ui_base.gyp:ui_base', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', - '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', + '../gfx/gfx.gyp:gfx_geometry', 'aura', 'aura_test_support', ], @@ -237,24 +245,31 @@ 'sources': [ 'bench/bench_main.cc', ], + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ + '../gfx/x/gfx_x11.gyp:gfx_x11', + ], + }], + ] }, { 'target_name': 'aura_unittests', 'type': 'executable', 'dependencies': [ '../../base/base.gyp:test_support_base', - '../../chrome/chrome_resources.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../base/ui_base.gyp:ui_base', + '../base/ui_base.gyp:ui_base_test_support', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', '../events/events.gyp:events', '../events/events.gyp:events_base', + '../events/events.gyp:gesture_detection', '../gfx/gfx.gyp:gfx', + '../gfx/gfx.gyp:gfx_geometry', '../gl/gl.gyp:gl', - '../resources/ui_resources.gyp:ui_resources', - '../ui.gyp:ui', - '../ui_unittests.gyp:ui_test_support', 'aura_test_support', 'aura', ], @@ -263,11 +278,8 @@ ], 'sources': [ 'gestures/gesture_recognizer_unittest.cc', - 'root_window_host_x11_unittest.cc', - 'root_window_unittest.cc', + 'window_event_dispatcher_unittest.cc', 'test/run_all_unittests.cc', - 'test/test_suite.cc', - 'test/test_suite.h', 'window_targeter_unittest.cc', 'window_unittest.cc', ], @@ -278,7 +290,7 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS=="linux" and linux_use_tcmalloc==1', { + ['OS=="linux" and use_allocator!="none"', { 'dependencies': [ # See http://crbug.com/162998#c4 for why this is needed. '../../base/allocator/allocator.gyp:allocator', |