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

Unified Diff: ash/BUILD.gn

Issue 705623004: GN: Get os="chromeos" use_ozone=true to compile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes, build chrome and app_shell Created 6 years, 1 month 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 | chrome/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 75a7a74aaff9d5ca427f74c8b834b440e319aa3e..628569f30741b3f25ddee9d0698945ef239c0057 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) {
« no previous file with comments | « no previous file | chrome/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698