Commit 2d36b2f1 authored by Daniel Rubery's avatar Daniel Rubery Committed by Commit Bot

Temporarily add safe_browsing to allow_circular_includes_from

Add //chrome/browser/safe_browsing to the allow_circular_includes_from
list for //chrome/browser/ui, and //chrome/browser/extensions. A real
solution would involve rather substantial refactoring of the Safe
Browsing code base. So do this to prevent build instability in the
meantime.

Bug: 919683, 925153
Change-Id: Iff0c9d0c67098c6255217721b55a390999e65737
Reviewed-on: https://chromium-review.googlesource.com/c/1436035
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626280}
parent 739a0681
......@@ -743,9 +743,13 @@ jumbo_static_library("extensions") {
]
defines = []
# TODO(loyso): Remove this circular dependency. http://crbug.com/876576.
allow_circular_includes_from =
[ "//chrome/browser/web_applications/extensions" ]
allow_circular_includes_from = [
# TODO(loyso): Remove this circular dependency. http://crbug.com/876576.
"//chrome/browser/web_applications/extensions",
# TODO(crbug/925153): Remove this circular dependency.
"//chrome/browser/safe_browsing",
]
# Since browser and browser_extensions actually depend on each other,
# we must omit the dependency from browser_extensions to browser.
......
......@@ -337,7 +337,8 @@ jumbo_split_static_library("ui") {
]
}
allow_circular_includes_from = []
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [ "//chrome/browser/safe_browsing" ]
defines = []
libs = []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment