diff options
| author | hans <hans@chromium.org> | 2014-11-04 13:02:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-04 21:04:51 +0000 |
| commit | eec0e16fd896b4670bddf2ff5d1c70d5f5cbb173 (patch) | |
| tree | 922a8f3262387ca9bc0e1d3a9ce1ca667100fe15 /ui/views/examples | |
| parent | 365da31903bcebe7d6d49b802701f7c1a9e112f5 (diff) | |
| download | chromium_src-eec0e16fd896b4670bddf2ff5d1c70d5f5cbb173.zip chromium_src-eec0e16fd896b4670bddf2ff5d1c70d5f5cbb173.tar.gz chromium_src-eec0e16fd896b4670bddf2ff5d1c70d5f5cbb173.tar.bz2 | |
Add more allocator.gyp:allocator dependencies
The dependency is necessary to avoid multiple definitions of memory
allocation functions in static_library Debug builds on Windows.
BUG=429498
NOTRY=true
Review URL: https://codereview.chromium.org/695913003
Cr-Commit-Position: refs/heads/master@{#302663}
Diffstat (limited to 'ui/views/examples')
| -rw-r--r-- | ui/views/examples/examples.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp index a2fa62f..f29c001 100644 --- a/ui/views/examples/examples.gyp +++ b/ui/views/examples/examples.gyp @@ -189,6 +189,11 @@ '../../../content/content.gyp:content_startup_helper_win', ], }], + ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + }], ], }, # target_name: views_examples_with_content_exe ], |