summaryrefslogtreecommitdiffstats
path: root/content/content_renderer.gypi
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 15:48:34 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 15:48:34 +0000
commit0345c1ad1f6600ae7b6383f23becf4e48e8cd96b (patch)
tree010c5517220b729726d738d24e555c37bf626375 /content/content_renderer.gypi
parent89d544322213cf1e5dfc2208eb6fcaae82297506 (diff)
downloadchromium_src-0345c1ad1f6600ae7b6383f23becf4e48e8cd96b.zip
chromium_src-0345c1ad1f6600ae7b6383f23becf4e48e8cd96b.tar.gz
chromium_src-0345c1ad1f6600ae7b6383f23becf4e48e8cd96b.tar.bz2
Make content_renderer.lib depend directly on allocator so that PERFTOOLS_DLL_DECL is defined when building this lib. This gets rid of a number of LNK4217 warnings about locally defined symbols.
BUG=none TEST=look for LNK4217 in build logs. Review URL: http://codereview.chromium.org/7649017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_renderer.gypi')
-rw-r--r--content/content_renderer.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index eb73938..097e71f 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -219,6 +219,11 @@
],
},
}],
+ ['OS=="win" and win_use_allocator_shim==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
['enable_webrtc==1', {
'dependencies': [
'../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',