diff options
| author | sadrul <sadrul@chromium.org> | 2015-06-09 23:09:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-10 06:10:15 +0000 |
| commit | 46709b27b2caa9a4203eef168ac11291ec8d2834 (patch) | |
| tree | 6c2eae3cced25395b1add48c1e911ae663fbecd2 /apps | |
| parent | 0ef928ab222a4ffe3b32b278190c31b534e30cd9 (diff) | |
| download | chromium_src-46709b27b2caa9a4203eef168ac11291ec8d2834.zip chromium_src-46709b27b2caa9a4203eef168ac11291ec8d2834.tar.gz chromium_src-46709b27b2caa9a4203eef168ac11291ec8d2834.tar.bz2 | |
extensions: Check |enable_extensions| flag before depending on extension code.
Avoid depending on (or including) extensions related code when enable_extensions
gyp/gn flag is not set. This fixes 'gn gen' for android with toolkit_views turned
on.
BUG=488576
Review URL: https://codereview.chromium.org/1160773004
Cr-Commit-Position: refs/heads/master@{#333690}
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/BUILD.gn | 4 | ||||
| -rw-r--r-- | apps/apps.gypi | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/BUILD.gn b/apps/BUILD.gn index 5c409c2..a719964 100644 --- a/apps/BUILD.gn +++ b/apps/BUILD.gn @@ -63,10 +63,12 @@ static_library("apps") { "ui/views/app_window_frame_view.h", ] deps += [ - "//extensions/browser", "//ui/strings", "//ui/views", ] + if (enable_extensions) { + deps += [ "//extensions/browser" ] + } } # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. diff --git a/apps/apps.gypi b/apps/apps.gypi index 7badfe3..130cb8c 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -75,7 +75,6 @@ ], ['toolkit_views==1', { 'dependencies': [ - '../extensions/extensions.gyp:extensions_browser', '../ui/strings/ui_strings.gyp:ui_strings', '../ui/views/views.gyp:views', ], @@ -84,6 +83,11 @@ ['exclude', 'ui/views/'], ], }], + ['toolkit_views==1 and enable_extensions==1', { + 'dependencies': [ + '../extensions/extensions.gyp:extensions_browser', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], |