diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-09 02:56:55 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-09 02:56:55 +0000 |
| commit | 4ae4bb07e4551c75942ec61f2ae35cd60c195321 (patch) | |
| tree | 495aeaa1adea214466aa0b0db8cec7f3b0990439 /ui | |
| parent | 28cb43c3d3b3191722e74f54552d344bbe5500f4 (diff) | |
| download | chromium_src-4ae4bb07e4551c75942ec61f2ae35cd60c195321.zip chromium_src-4ae4bb07e4551c75942ec61f2ae35cd60c195321.tar.gz chromium_src-4ae4bb07e4551c75942ec61f2ae35cd60c195321.tar.bz2 | |
Add views_unittests allocator.gyp dependency for non-component builds.
Found via crbug.com/131660 & codereview.chromium.org/10535046
My local views_unittests non-component Windows build fails with:
LNK2005: __malloc_dbg already defined in allocator.lib(allocator_shim.obj) LIBCMTD.lib
Condition the dependency on win_use_allocator_shim, as elsewhere.
Otherwise, views_unittests component builds ("win" trybot) fail with:
msvcprtd.lib(MSVCP90D.dll) : error LNK2005: "public: __thiscall
std::basic_string<char,struct std::char_traits<char>,class std::allocator<char>
>::~basic_string<char,struct std::char_traits<char>,class std::allocator<char>
>(void)"
(??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ) already
defined in allocator.lib(allocator_shim.obj)
BUG=NONE
TEST=views_unittests builds work everywhere!
Review URL: https://chromiumcodereview.appspot.com/10534070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/views.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 76fe985..d21b64e 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -560,6 +560,11 @@ '../third_party/wtl/include', ], }], + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '../../base/allocator/allocator.gyp:allocator', + ], + }], ['use_aura==0 and OS=="win"', { 'sources/': [ ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'], |