diff options
| author | lfg <lfg@chromium.org> | 2014-10-10 22:31:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-11 05:31:30 +0000 |
| commit | 6c0aaa6ee9ff659cbae080363004b4ff21002ab3 (patch) | |
| tree | 974ad2093041da54b625c35b2f64d3b1c0ce99bd /extensions | |
| parent | 1a877b28e6f04310877883eec3cb233c0cc17e12 (diff) | |
| download | chromium_src-6c0aaa6ee9ff659cbae080363004b4ff21002ab3.zip chromium_src-6c0aaa6ee9ff659cbae080363004b4ff21002ab3.tar.gz chromium_src-6c0aaa6ee9ff659cbae080363004b4ff21002ab3.tar.bz2 | |
Fix windows static library build of app_shell / app_shell_browsertests / app_shell_unittests.
BUG=399363
Review URL: https://codereview.chromium.org/649793003
Cr-Commit-Position: refs/heads/master@{#299236}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/shell/app_shell.gyp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 94993a9..0e1ad76 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -161,6 +161,11 @@ '<(DEPTH)/sandbox/sandbox.gyp:sandbox', ], }], + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + }], ], }, { @@ -199,6 +204,13 @@ 'test/shell_test_launcher_delegate.h', 'test/shell_tests_main.cc', ], + 'conditions': [ + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + }], + ], }, { 'target_name': 'app_shell_unittests', @@ -232,6 +244,11 @@ '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock', ], }], + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + }], ], }, { |