summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 20:37:57 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 20:37:57 +0000
commit114efaeb2baaeb92a34a773c8e0379e1b221e379 (patch)
treee35ca9e3237bcb372441391221be0bfb700a23b9 /ui/ui.gyp
parent7fa2be92b9f0553a47e28ac96710cff039311044 (diff)
downloadchromium_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.gyp')
-rw-r--r--ui/ui.gyp11
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 18ebe56..b167374 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -26,19 +26,15 @@
'../third_party/zlib/zlib.gyp:zlib',
'../url/url.gyp:url_lib',
'base/strings/ui_strings.gyp:ui_strings',
- 'events/events.gyp:events',
+ 'events/events.gyp:events_base',
'gfx/gfx.gyp:gfx',
'ui_resources',
],
'defines': [
'UI_IMPLEMENTATION',
],
- # 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',
- 'events/events.gyp:events',
'gfx/gfx.gyp:gfx',
],
'sources' : [
@@ -351,6 +347,11 @@
],
},
}],
+ ['toolkit_views==1', {
+ 'dependencies': [
+ 'events/events.gyp:events',
+ ],
+ }],
['use_aura==1', {
'sources/': [
['exclude', 'base/work_area_watcher_observer.h'],