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

Unified Diff: ui/ozone/BUILD.gn

Issue 1716543003: ozone: Use allow_circular_includes_from to fix deps issue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | ui/ozone/common/stub_client_native_pixmap_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/BUILD.gn
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index c8c0b5be2e4319b596d3ca4ef22b144ca4521ecd..b4dbf1880d5ca3bea04118193b0b055bbf1f1844 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -143,28 +143,28 @@ component("ozone") {
public_deps = [
":ozone_base",
+ "//base",
+ "//ipc",
+ "//skia",
+ "//ui/display/types",
+ "//ui/events",
+ "//ui/events/devices",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ "//ui/platform_window",
]
- deps =
- [
- ":generate_constructor_list",
- ":generate_ozone_platform_list",
- "//base",
- "//ipc",
- "//skia",
- "//ui/display/types",
- "//ui/display/util",
- "//ui/events",
- "//ui/events/devices",
- "//ui/events/ozone:events_ozone",
- "//ui/gfx",
- "//ui/gfx/geometry",
- "//ui/gfx/ipc",
- "//ui/platform_window",
-
- # TODO(GYP) the GYP version has a way to add additional dependencies via
- # build flags.
- ] + ozone_platform_deps
+ deps = [
+ ":generate_constructor_list",
+ ":generate_ozone_platform_list",
+ ]
+
+ # TODO(GYP) the GYP version has a way to add additional dependencies via
rjkroege 2016/02/19 19:00:53 So, can we add additional platforms from an extern
spang 2016/02/22 19:27:13 Might be possible to do it via gn args. Nobody has
+ # build flags.
+ public_deps += ozone_platform_deps
+
+ # Platforms are always linked into //ui/ozone and can include our headers.
+ allow_circular_includes_from = ozone_platform_deps
}
# GYP version: ui/ozone/ozone.gyp:generate_ozone_platform_list
« no previous file with comments | « no previous file | ui/ozone/common/stub_client_native_pixmap_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698