summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2014-09-11 13:38:23 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 20:46:27 +0000
commit69efd071162c9be1fd6a7c46437ba852c1edf666 (patch)
treecc90b7ad4770a32c630f9b5a06f3ac0763a8bf3e
parent769f4ff633609dfa641d52548e53f25ac65c640f (diff)
downloadchromium_src-69efd071162c9be1fd6a7c46437ba852c1edf666.zip
chromium_src-69efd071162c9be1fd6a7c46437ba852c1edf666.tar.gz
chromium_src-69efd071162c9be1fd6a7c46437ba852c1edf666.tar.bz2
Put back allow_circular_includes_from in GN build.
A previous patch commented these out, but this ended up not being necessary. Put them back. Review URL: https://codereview.chromium.org/565733003 Cr-Commit-Position: refs/heads/master@{#294460}
-rw-r--r--content/public/browser/BUILD.gn3
-rw-r--r--content/public/renderer/BUILD.gn3
-rw-r--r--content/public/utility/BUILD.gn3
3 files changed, 3 insertions, 6 deletions
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 6033098..8d30523 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -54,8 +54,7 @@ source_set("browser_sources") {
allow_circular_includes_from = [
# This target is a pair with content/browser. They always go together and
# include headers from each other.
- # TODO(brettw) enable this when this permits non-dependent targets.
- #"//content/browser",
+ "//content/browser",
]
# We expose skia headers in the public API.
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
index 525473f..5d34977 100644
--- a/content/public/renderer/BUILD.gn
+++ b/content/public/renderer/BUILD.gn
@@ -39,8 +39,7 @@ source_set("renderer_sources") {
allow_circular_includes_from = [
# This target is a pair with content/renderer. They always go together and
# include headers from each other.
- # TODO(brettw) enable this when this permits non-dependent targets.
- #"//content/renderer",
+ "//content/renderer",
]
if (enable_webrtc) {
diff --git a/content/public/utility/BUILD.gn b/content/public/utility/BUILD.gn
index e6fecd0..0fffc22 100644
--- a/content/public/utility/BUILD.gn
+++ b/content/public/utility/BUILD.gn
@@ -35,8 +35,7 @@ source_set("utility_sources") {
allow_circular_includes_from = [
# This target is a pair with content/browser. They always go together and
# include headers from each other.
- # TODO(brettw) enable this when this permits non-dependent targets.
- #"//content/utility",
+ "//content/utility",
]
}