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

Unified Diff: ui/display/BUILD.gn

Issue 699263002: Try to resuscitate the builds needed to do official GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix package exclusion for gconf 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
« build/config/linux/BUILD.gn ('K') | « build/config/linux/BUILD.gn ('k') | 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 e13abd9553c62f3413b7ccd546f530ccb8206819..94887717b0254939ee138aa4869c9d55c910cfae 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -55,19 +55,21 @@ component("display") {
if (use_ozone) {
deps += [ "//ui/ozone" ]
- 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",
- ]
+ if (is_chromeos) {
Chris Masone 2014/11/04 23:33:16 Ozone is pretty much a replacement for X11, so it
brettw 2014/11/04 23:47:52 These are filtered out in the non-chromeos case by
Chris Masone 2014/11/05 00:53:31 Acknowledged.
+ 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",
+ ]
+ }
}
}
« build/config/linux/BUILD.gn ('K') | « build/config/linux/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698