diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:30:23 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:30:23 +0000 |
| commit | cfb339d1e691ebb4c88b415e38c342e184a053a4 (patch) | |
| tree | 3ee68ba64611f201ce2af01d45a8640dd74c5df0 | |
| parent | 1646c9e180c21391885322125bae8df9479ec579 (diff) | |
| download | chromium_src-cfb339d1e691ebb4c88b415e38c342e184a053a4.zip chromium_src-cfb339d1e691ebb4c88b415e38c342e184a053a4.tar.gz chromium_src-cfb339d1e691ebb4c88b415e38c342e184a053a4.tar.bz2 | |
Make gles2_conform_support depend on allocator.gyp:allocator when necessary
This fixes the heapchecker+components release build.
BUG=241938
Review URL: https://chromiumcodereview.appspot.com/15378003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200986 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 94ebebf..7e62d32 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -114,6 +114,12 @@ ['toolkit_uses_gtk == 1', { 'dependencies': ['../../build/linux/system.gyp:gtk'], }], + # See http://crbug.com/162998#c4 for why this is needed. + ['OS=="linux" and linux_use_tcmalloc==1', { + 'dependencies': [ + '../../base/allocator/allocator.gyp:allocator', + ], + }], ], 'defines': [ 'GLES2_CONFORM_SUPPORT_ONLY', |