Add the linux_use_heapchecker GYP variable that should turn the tcmalloc heap...

base/allocator/allocator.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
   },
   'targets': [
@@ skipping 314 matching lines @@
             '-fvisibility=hidden',
           ],
           'link_settings': {
             'ldflags': [
               # Don't let linker rip this symbol out, otherwise the heap&cpu
               # profilers will not initialize properly on startup.
               '-Wl,-uIsHeapProfilerRunning,-uProfilerStart',
               # Do the same for heap leak checker.
               '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
               '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
+            ]},
+          }],
+          [ 'linux_use_heapchecker==0', {
+            # Do not compile and link the heapchecker source.
+            'sources!': [
+              '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
+              '<(tcmalloc_dir)/src/heap-checker.cc',
             ],
-          },
-        }],
+            # Disable the heap checker in tcmalloc.
+            'cflags': [
+              '-DNO_HEAP_CHECK',
+            ],
+          }],
       ],
     },
     {
       'target_name': 'allocator_unittests',
       'type': 'executable',
       'dependencies': [
         'allocator',
         '../../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
@@ skipping 35 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: