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

Unified Diff: ui/gfx/BUILD.gn

Issue 334633010: GN: Only have one gfx_x11 target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comments Created 6 years, 6 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 | « ui/compositor/BUILD.gn ('k') | ui/gfx/x/BUILD.gn » ('j') | ui/gfx/x/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/BUILD.gn
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index e2796a1b7ac1616ee156c6a5c72ad4a99755e638..e2fd0de19055f9d46c7ed36f8e9cf8120a36b123 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -336,7 +336,7 @@ component("gfx") {
if (use_x11) {
deps += [
- ":gfx_x11",
+ "//ui/gfx/x",
]
} else {
sources -= [
@@ -418,28 +418,3 @@ if (is_android) {
jni_package = "gfx"
}
}
-
-if (use_x11) {
- component("gfx_x11") {
- sources = [
- "x/x11_atom_cache.cc",
- "x/x11_atom_cache.h",
- "x/x11_connection.cc",
- "x/x11_connection.h",
- "x/x11_error_tracker.cc",
- "x/x11_error_tracker.h",
- "x/x11_switches.cc",
- "x/x11_switches.h",
- "x/x11_types.cc",
- "x/x11_types.h",
- ]
-
- defines = [ "GFX_IMPLEMENTATION" ]
- configs += [ "//build/config/linux:x11" ]
-
- deps = [
- ":gfx_export",
- "//base"
- ]
- }
-}
« no previous file with comments | « ui/compositor/BUILD.gn ('k') | ui/gfx/x/BUILD.gn » ('j') | ui/gfx/x/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698