diff options
| author | tapted <tapted@chromium.org> | 2014-10-02 16:45:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-02 23:46:03 +0000 |
| commit | 344272ddd4ca47fb56fd6a1ca6a4f1418df2c426 (patch) | |
| tree | a711d865e73a7a38e3b07b3c28f486671367a5a2 /apps/apps.gypi | |
| parent | c4c7e842b3ba77671b74ac263e5fb7217c3dfbfb (diff) | |
| download | chromium_src-344272ddd4ca47fb56fd6a1ca6a4f1418df2c426.zip chromium_src-344272ddd4ca47fb56fd6a1ca6a4f1418df2c426.tar.gz chromium_src-344272ddd4ca47fb56fd6a1ca6a4f1418df2c426.tar.bz2 | |
Move components/native_app_window to extensions/components/native_app_window
There's currently a dependency cycle between gyp files: components.gyp
and extensions.gyp. extensions.gyp depends on a number of components,
and two components depend on exetensions.gyp. These are:
- components/renderer_context_menu/
- components/native_app_window/ (more recently)
renderer_context_menu has an "optional" extensions dependency, which can
be skipped when ENABLE_EXTENSIONS is not defined. Still, it is necessary
for renderer_context_menu.gyp to omit its extensions.gyp dependency and
build as a static library.
For native_app_window, since it is not compiled on Mac, the gyp circular
check is not performed on the bots.
This CL fixes the layering by adding a folder,
src/extensions/components. Things here may depend on extensions, but not
on other extensions/components folders in a way that creates a cycle.
This also allows the benefits of a component-architecture to make sense
of interdependencies between the ~1337 files under src/extensions.
This layout also makes it clear that by depending on one of these
components, a target is also depending on src/extensions. Currently,
this is not clear.
BUG=35878, 418455
TBR=reed@google.com
Review URL: https://codereview.chromium.org/606953002
Cr-Commit-Position: refs/heads/master@{#297952}
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index cb8478d..7badfe3 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -75,7 +75,7 @@ ], ['toolkit_views==1', { 'dependencies': [ - '../components/components.gyp:native_app_window', + '../extensions/extensions.gyp:extensions_browser', '../ui/strings/ui_strings.gyp:ui_strings', '../ui/views/views.gyp:views', ], |