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

Unified Diff: ui/display/BUILD.gn

Issue 1106843003: Remove redundant chromeos checks from GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wincomp_sync_ui
Patch Set: Created 5 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 7519929049c01db6cd7152fc2294167e84484bee..e664b1ae5abdf4583f6f7c17a3b43bca6e111fc5 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -42,12 +42,14 @@ if (is_chromeos) {
deps = [
"//base",
+ "//ui/display/types",
"//ui/display/util",
"//ui/gfx",
"//ui/gfx/geometry",
]
if (use_x11) {
+ sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
configs += [
"//build/config/linux:x11",
"//build/config/linux:xext",
@@ -55,35 +57,28 @@ if (is_chromeos) {
"//build/config/linux:xrandr",
]
deps += [ "//ui/events/platform" ]
- if (is_chromeos) {
- sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
- }
}
- if (is_chromeos) {
- deps += [ "//ui/display/types" ]
- if (use_x11) {
- deps += [ "//ui/gfx/x" ]
- }
+ deps += []
+ if (use_x11) {
+ deps += [ "//ui/gfx/x" ]
}
if (use_ozone) {
deps += [ "//ui/ozone" ]
- if (is_chromeos) {
- sources -= [
- "chromeos/x11/display_configurator_x11.cc",
- "chromeos/x11/display_mode_x11.cc",
- "chromeos/x11/display_mode_x11.h",
- "chromeos/x11/display_snapshot_x11.cc",
- "chromeos/x11/display_snapshot_x11.h",
- "chromeos/x11/display_util_x11.cc",
- "chromeos/x11/display_util_x11.h",
- "chromeos/x11/native_display_delegate_x11.cc",
- "chromeos/x11/native_display_delegate_x11.h",
- "chromeos/x11/native_display_event_dispatcher_x11.cc",
- "chromeos/x11/native_display_event_dispatcher_x11.h",
- ]
- }
+ sources -= [
+ "chromeos/x11/display_configurator_x11.cc",
+ "chromeos/x11/display_mode_x11.cc",
+ "chromeos/x11/display_mode_x11.h",
+ "chromeos/x11/display_snapshot_x11.cc",
+ "chromeos/x11/display_snapshot_x11.h",
+ "chromeos/x11/display_util_x11.cc",
+ "chromeos/x11/display_util_x11.h",
+ "chromeos/x11/native_display_delegate_x11.cc",
+ "chromeos/x11/native_display_delegate_x11.h",
+ "chromeos/x11/native_display_event_dispatcher_x11.cc",
+ "chromeos/x11/native_display_event_dispatcher_x11.h",
+ ]
}
}
@@ -101,13 +96,10 @@ if (is_chromeos) {
]
deps = [
"//base",
+ "//ui/display/types",
"//ui/gfx",
"//ui/gfx/geometry",
]
-
- if (is_chromeos) {
- deps += [ "//ui/display/types" ]
- }
}
source_set("test_support") {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698