diff options
| author | dpranke <dpranke@chromium.org> | 2014-11-04 19:54:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-05 03:55:02 +0000 |
| commit | acd282e852c15ea7b3dd1d09252dbe9f66578f2c (patch) | |
| tree | 003e2296d79e4e223fd8faa30b5958814b6a44d3 /ash/BUILD.gn | |
| parent | bb04107761cec15ad533cc2bd6258f462443bf49 (diff) | |
| download | chromium_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 'ash/BUILD.gn')
| -rw-r--r-- | ash/BUILD.gn | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 75a7a74..628569f 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -74,6 +74,10 @@ component("ash") { "accelerators/magnifier_key_scroller.h", "accelerators/spoken_feedback_toggler.cc", "accelerators/spoken_feedback_toggler.h", + "host/ash_window_tree_host_x11.cc", + "host/ash_window_tree_host_x11.h", + "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", + "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", ] } @@ -97,17 +101,12 @@ component("ash") { "system/tray/media_security/media_capture_observer.h", "system/tray/media_security/multi_profile_media_tray_item.cc", "system/tray/media_security/multi_profile_media_tray_item.h", - "virtual_keyboard_controller.cc", - "virtual_keyboard_controller.h", - ] - } - - if (!use_x11 || !is_chromeos) { - sources -= [ "touch/touch_transformer_controller.cc", "touch/touch_transformer_controller.h", "touch/touchscreen_util.cc", "touch/touchscreen_util.h", + "virtual_keyboard_controller.cc", + "virtual_keyboard_controller.h", ] } @@ -301,6 +300,7 @@ test("ash_unittests") { sources -= [ "accelerators/magnifier_key_scroller_unittest.cc", "accelerators/spoken_feedback_toggler_unittest.cc", + "host/ash_window_tree_host_x11_unittest.cc", ] } if (is_chromeos) { |