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

Unified Diff: ash/BUILD.gn

Issue 843583006: GN: Add -Wl,-z defs on linux and fix errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')
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 6a928485cfc2f68de5353bc43b90b393cd08b7a3..f2a265cf2b6d23cca0fce7f3e8b7e0600724fcfe 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -64,7 +64,15 @@ component("ash") {
}
if (use_x11) {
- configs += [ "//build/config/linux:xfixes" ]
+ configs += [
+ "//build/config/linux:x11",
+ "//build/config/linux:xfixes",
+ ]
+ deps += [
+ "//ui/events:gesture_detection",
+ "//ui/events/platform",
+ "//ui/gfx/x",
+ ]
} else {
sources -= [
"host/ash_window_tree_host_x11.cc",
@@ -76,6 +84,11 @@ component("ash") {
if (use_ozone) {
deps += [ "//ui/ozone" ]
+ } else {
+ sources -= [
+ "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
+ "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+ ]
}
if (is_chromeos) {
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698