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

Unified Diff: ui/events/BUILD.gn

Issue 1405773004: Aura on Android: Making events work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_idle
Patch Set: Missing import. Created 5 years, 2 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 | « no previous file | ui/events/events.gyp » ('j') | ui/events/events.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 4dff2ee06adfb2690f75f51abf70de3a32a636b5..d72fe53474f3027d14e157c4774d33e9b6382356 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -152,8 +152,15 @@ component("events") {
]
}
+ if (use_ozone || (is_android && use_aura)) {
+ sources += [ "events_default.cc" ]
+ }
+
if (use_ozone) {
- sources += [ "ozone/events_ozone.cc" ]
+ sources += [
+ "ozone/events_ozone.cc",
+ "ozone/events_ozone.h",
+ ]
deps += [ "//ui/events/ozone:events_ozone_layout" ]
}
@@ -169,7 +176,7 @@ component("events") {
]
}
- if (is_win || is_mac || use_x11 || use_ozone) {
+ if (is_win || is_mac || use_x11 || use_ozone || (is_android && use_aura)) {
no sievers 2015/10/22 19:08:27 nit: now that this has grown very long, should we
mfomitchev 2015/10/22 20:34:36 I don't have a particularly strong opinion, but I
sources -= [ "events_stub.cc" ]
}
}
@@ -357,7 +364,9 @@ test("events_unittests") {
]
}
- data_deps = [ "//third_party/mesa:osmesa" ]
+ data_deps = [
+ "//third_party/mesa:osmesa",
+ ]
include_dirs = [ "//testing/gmock/include" ]
« no previous file with comments | « no previous file | ui/events/events.gyp » ('j') | ui/events/events.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698