diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 20:37:57 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-06 20:37:57 +0000 |
| commit | 114efaeb2baaeb92a34a773c8e0379e1b221e379 (patch) | |
| tree | e35ca9e3237bcb372441391221be0bfb700a23b9 /ui/ui_unittests.gyp | |
| parent | 7fa2be92b9f0553a47e28ac96710cff039311044 (diff) | |
| download | chromium_src-114efaeb2baaeb92a34a773c8e0379e1b221e379.zip chromium_src-114efaeb2baaeb92a34a773c8e0379e1b221e379.tar.gz chromium_src-114efaeb2baaeb92a34a773c8e0379e1b221e379.tar.bz2 | |
Restructure the events target into two components:
- events_base (built by most people) - defining some basic utilities.
- events (built by users of aura/views) - the ui::Event type & friends.
Prior to this there was one target, and platforms that did not want ui::Event would exclude those files explicitly, making it hard to build those files on those platforms without breaking other components.
R=sadrul@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/57433011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gyp')
| -rw-r--r-- | ui/ui_unittests.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index 77ef413..bc7c586 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -13,7 +13,6 @@ '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - 'events/events.gyp:events', 'gfx/gfx.gyp:gfx', ], 'sources': [ @@ -89,7 +88,7 @@ '../third_party/libpng/libpng.gyp:libpng', '../url/url.gyp:url_lib', 'base/strings/ui_strings.gyp:ui_strings', - 'events/events.gyp:events', + 'events/events.gyp:events_base', 'run_ui_unittests', 'shell_dialogs/shell_dialogs.gyp:shell_dialogs', 'ui.gyp:keycode_converter', @@ -155,7 +154,6 @@ 'base/cocoa/controls/blue_label_button_unittest.mm', 'base/cocoa/controls/hover_image_menu_button_unittest.mm', 'base/cocoa/controls/hyperlink_button_cell_unittest.mm', - 'base/cocoa/events_mac_unittest.mm', 'base/cocoa/focus_tracker_unittest.mm', 'base/cocoa/fullscreen_window_manager_unittest.mm', 'base/cocoa/hover_image_button_unittest.mm', @@ -332,6 +330,12 @@ 'events/event_unittest.cc', ], }], + ['toolkit_views==1', { + 'dependencies': [ + 'events/events.gyp:events', + 'events/events.gyp:events_base', + ], + }], ['use_aura==1', { 'sources!': [ 'base/dialogs/select_file_dialog_win_unittest.cc', |