diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 03:11:55 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 03:11:55 +0000 |
| commit | ee01309caee5c8ec26f7338f866a86f068d6458a (patch) | |
| tree | 9f38ce8834d0a9b8055c8455c37589ac066bea0f /build/all.gyp | |
| parent | da668570e23f72e27b8b5556af6627aa14634431 (diff) | |
| download | chromium_src-ee01309caee5c8ec26f7338f866a86f068d6458a.zip chromium_src-ee01309caee5c8ec26f7338f866a86f068d6458a.tar.gz chromium_src-ee01309caee5c8ec26f7338f866a86f068d6458a.tar.bz2 | |
Break cycles between views, content and webview.
When running gyp_chromium with the following diff:
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 63e8671..ca9b6a4 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -509,8 +509,6 @@ if __name__ == '__main__':
# option. http://crbug.com/35878.
# TODO(tc): Fix circular dependencies in ChromiumOS then add linux2
# list.
- if sys.platform not in ('darwin',):
- args.append('--no-circular-check')
These cycles are found:
gyp: Cycles in .gyp file dependency graph detected:
Cycle: content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp
Cycle: ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp
Cycle: ui/views/views.gyp -> content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp -> ui/views/views.gyp
Cycle: ui/views/views.gyp -> content/content_shell_and_tests.gyp ->
ui/views/views.gyp
Cycle: ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
ui/views/controls/webview/webview.gyp
Cycle: ui/views/views.gyp -> ui/views/controls/webview/webview.gyp ->
ui/views/views.gyp
Cycle: content/content_shell_and_tests.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp
By moving '*examples*' targets from views.gyp to examples.gyp we break
most of these cycles.
Then it remains the cycle:
Cycle: content/content_shell_and_tests.gyp -> ui/views/controls/webview/webview.gyp -> content/content_shell_and_tests.gyp
To fix that we introduced a webview_tests.gyp to which we moved the include of
content_shell_and_tests.gyp from webview.gyp, and thus breaking that
cycle and fixing all the circlar dependencies found above.
BUG=331669,35878
TEST=run gyp_chromium with the above diff, gyp should not throw any
cycles output.
R=ben@chromium.org, harrym@chromium.org, tapted@chromium.org
Review URL: https://codereview.chromium.org/201093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 142c4f5..39e9ed3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -1176,8 +1176,8 @@ '../ui/message_center/message_center.gyp:*', '../ui/snapshot/snapshot.gyp:snapshot_unittests', '../ui/ui_unittests.gyp:ui_unittests', + '../ui/views/examples/examples.gyp:views_examples_with_content_exe', '../ui/views/views.gyp:views', - '../ui/views/views.gyp:views_examples_with_content_exe', '../ui/views/views.gyp:views_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', 'blink_tests', |