summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 14:39:49 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 14:39:49 +0000
commit0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e (patch)
tree875280ba2122eb815705a9f504633e6ded42717f /base/allocator
parenta9763e6a7e04f3a82f2c55365f537925677b89d7 (diff)
downloadchromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.zip
chromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.tar.gz
chromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.tar.bz2
Remove heapcheck support.
The bots are gone, no need to keep this around. The replacement that's maintained by the dynamic tools team is ASan / LSan. BUG=325380 Review URL: https://codereview.chromium.org/113193008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
-rw-r--r--base/allocator/allocator.gyp34
1 files changed, 7 insertions, 27 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 85574ab..4841f58 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -253,6 +253,8 @@
'<(tcmalloc_dir)/src/gperftools/profiler.h',
'<(tcmalloc_dir)/src/gperftools/stacktrace.h',
'<(tcmalloc_dir)/src/gperftools/tcmalloc.h',
+ '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
+ '<(tcmalloc_dir)/src/heap-checker.cc',
'<(tcmalloc_dir)/src/libc_override.h',
'<(tcmalloc_dir)/src/libc_override_gcc_and_weak.h',
'<(tcmalloc_dir)/src/libc_override_glibc.h',
@@ -325,6 +327,10 @@
],
},
},
+ # Disable the heap checker in tcmalloc.
+ 'defines': [
+ 'NO_HEAP_CHECK',
+ ],
'conditions': [
['OS=="linux" and clang_type_profiler==1', {
'dependencies': [
@@ -371,11 +377,9 @@
# included by allocator_shim.cc
'debugallocation_shim.cc',
- # heap-checker/cpuprofiler
+ # cpuprofiler
'<(tcmalloc_dir)/src/base/thread_lister.c',
'<(tcmalloc_dir)/src/base/thread_lister.h',
- '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
- '<(tcmalloc_dir)/src/heap-checker.cc',
'<(tcmalloc_dir)/src/profiledata.cc',
'<(tcmalloc_dir)/src/profiledata.h',
'<(tcmalloc_dir)/src/profile-handler.cc',
@@ -432,30 +436,6 @@
'-fvtable-verify=preinit',
],
}],
- [ 'linux_keep_shadow_stacks==1', {
- 'sources': [
- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc',
- '<(tcmalloc_dir)/src/linux_shadow_stacks.h',
- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h',
- ],
- 'cflags': [
- '-finstrument-functions',
- ],
- 'defines': [
- 'KEEP_SHADOW_STACKS',
- ],
- }],
- [ '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.
- 'defines': [
- 'NO_HEAP_CHECK',
- ],
- }],
['order_profiling != 0', {
'target_conditions' : [
['_toolset=="target"', {