summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 21:03:53 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-21 21:03:53 +0000
commit4277e8c5ef126607e54e1e1485392de5d685ffe0 (patch)
tree8077e8ee5bbc840e4f30dd2590f3981531e025d6 /media
parent6542953b9afddaef77b26154fb2357fa5b1df221 (diff)
downloadchromium_src-4277e8c5ef126607e54e1e1485392de5d685ffe0.zip
chromium_src-4277e8c5ef126607e54e1e1485392de5d685ffe0.tar.gz
chromium_src-4277e8c5ef126607e54e1e1485392de5d685ffe0.tar.bz2
Make shader_bench depend on allocator.gyp:allocator when necessary
This fixes the heapchecker+components release build. BUG=241938 R=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/15370004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 98fdb81..334f94e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1424,6 +1424,12 @@
'tools/shader_bench/window_win.cc',
],
}],
+ # See http://crbug.com/162998#c4 for why this is needed.
+ ['OS=="linux" and linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],