diff options
| author | blundell <blundell@chromium.org> | 2015-01-07 14:40:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 22:42:41 +0000 |
| commit | ff8521835751a4761c8cc3facd8723d091d51410 (patch) | |
| tree | 96041ef184cafe865345bb7a3e80b8b3426fe523 /extensions/shell | |
| parent | cd7c9d17c3d471e00136542092f167fb60e4244f (diff) | |
| download | chromium_src-ff8521835751a4761c8cc3facd8723d091d51410.zip chromium_src-ff8521835751a4761c8cc3facd8723d091d51410.tar.gz chromium_src-ff8521835751a4761c8cc3facd8723d091d51410.tar.bz2 | |
Fixes for extensions and athena deps.
The app_shell_lib target includes headers from content_browser in its own
public headers, and thus needs to both depend on content_browser and export its
dependent settings. The athena_main_lib target depends on the app_shell_lib
target.
Review URL: https://codereview.chromium.org/840783002
Cr-Commit-Position: refs/heads/master@{#310396}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/app_shell.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 600d656..392f3df0 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -24,6 +24,7 @@ '<(DEPTH)/components/components.gyp:user_prefs', '<(DEPTH)/components/components.gyp:web_cache_renderer', '<(DEPTH)/content/content.gyp:content', + '<(DEPTH)/content/content.gyp:content_browser', '<(DEPTH)/content/content.gyp:content_gpu', '<(DEPTH)/content/content.gyp:content_ppapi_plugin', '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib', @@ -45,6 +46,9 @@ '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], + 'export_dependent_settings': [ + '<(DEPTH)/content/content.gyp:content_browser', + ], 'include_dirs': [ '../..', '<(SHARED_INTERMEDIATE_DIR)', |