summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-04 19:54:47 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-05 03:55:02 +0000
commitacd282e852c15ea7b3dd1d09252dbe9f66578f2c (patch)
tree003e2296d79e4e223fd8faa30b5958814b6a44d3 /ui/aura
parentbb04107761cec15ad533cc2bd6258f462443bf49 (diff)
downloadchromium_src-acd282e852c15ea7b3dd1d09252dbe9f66578f2c.zip
chromium_src-acd282e852c15ea7b3dd1d09252dbe9f66578f2c.tar.gz
chromium_src-acd282e852c15ea7b3dd1d09252dbe9f66578f2c.tar.bz2
GN: Get os="chromeos" use_ozone=true to compile
There were a number of ozone targets that had rusted or never been implemented in the GN build for Chrome OS. Fix it! R=cmasone TBR=brettw BUG=424334 TEST=build chrome with os=chromeos use_ozone=true use_clang=true Review URL: https://codereview.chromium.org/705623004 Cr-Commit-Position: refs/heads/master@{#302752}
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/BUILD.gn14
1 files changed, 9 insertions, 5 deletions
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index 8b22fbb..733a9c2 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -115,6 +115,11 @@ component("aura") {
deps += [
"//ui/events/platform/x11",
]
+ } else {
+ sources -= [
+ "window_tree_host_x11.cc",
+ "window_tree_host_x11.h",
+ ]
}
if (is_win) {
@@ -134,11 +139,10 @@ component("aura") {
"window_tree_host_ozone.h",
]
- # TODO(GYP) enable when these targets exist.
- #deps += [
- # "//ui/events/ozone",
- # "//ui/ozone",
- #]
+ deps += [
+ "//ui/events/ozone:events_ozone",
+ "//ui/ozone",
+ ]
}
}