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

Unified Diff: ui/gfx/BUILD.gn

Issue 409163004: ozone: Fix GN build for ozone_egl_demo, ozone_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove media/BUILD.gn diffs Created 6 years, 5 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/events/ozone/BUILD.gn ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »
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 cab7e0c842003c7a3cac5825f7e1c1a46417818a..d4f30dce1f14ad51678d5b193983bff4fe2ea268 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -8,9 +8,6 @@ if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
-if (use_ozone) {
- import("//ui/ozone/ozone.gni")
-}
# Several targets want to include this header file, and some of them are
# child dependencies of "gfx". Therefore, we separate it out here so multiple
@@ -321,13 +318,6 @@ component("gfx") {
if (use_ozone) {
sources += [
"platform_font_ozone.cc",
- "ozone/impl/file_surface_factory.cc",
- "ozone/impl/file_surface_factory.h",
- "ozone/surface_factory_ozone.cc",
- "ozone/surface_factory_ozone.h",
- "ozone/surface_ozone.h",
- "ozone/overlay_candidates_ozone.cc",
- "ozone/overlay_candidates_ozone.h",
]
}
@@ -359,6 +349,11 @@ component("gfx") {
]
configs += [ "//build/config/linux:pangocairo" ]
}
+ if (use_pango && use_ozone) {
+ sources -= [
+ "platform_font_ozone.cc",
+ ]
+ }
}
# Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
« no previous file with comments | « ui/events/ozone/BUILD.gn ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698