Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index be716429554a36dfde24e7a5f18697346c308f0a..3c0aad30a3a05fbd5518a09efc40bb3282c757cf 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1113,13 +1113,6 @@ |
'linux_use_tcmalloc%': 1, |
'android_use_tcmalloc%': 0, |
- # Disable TCMalloc's heapchecker. |
- 'linux_use_heapchecker%': 0, |
- |
- # Disable shadow stack keeping used by heapcheck to unwind the stacks |
- # better. |
- 'linux_keep_shadow_stacks%': 0, |
- |
# Set to 1 to link against libgnome-keyring instead of using dlopen(). |
'linux_link_gnome_keyring%': 0, |
# Set to 1 to link against gsettings APIs instead of using dlopen(). |
@@ -3555,32 +3548,9 @@ |
}], |
], |
}], |
- ['linux_use_heapchecker==1', { |
- 'variables': {'linux_use_tcmalloc%': 1}, |
- 'defines': [ |
- 'USE_HEAPCHECKER', |
- 'MEMORY_TOOL_REPLACES_ALLOCATOR', |
- ], |
- 'conditions': [ |
- ['component=="shared_library"', { |
- # See crbug.com/112389 |
- # TODO(glider): replace with --dynamic-list or something |
- 'ldflags': ['-rdynamic'], |
- }], |
- ], |
- }], |
['linux_use_tcmalloc==0 and android_use_tcmalloc==0', { |
'defines': ['NO_TCMALLOC'], |
}], |
- ['linux_keep_shadow_stacks==1', { |
- 'defines': ['KEEP_SHADOW_STACKS'], |
- 'cflags': [ |
- '-finstrument-functions', |
- # Allow mmx intrinsics to inline, so that the compiler can expand |
- # the intrinsics. |
- '-finstrument-functions-exclude-file-list=mmintrin.h', |
- ], |
- }], |
['linux_use_gold_flags==1', { |
'target_conditions': [ |
['_toolset=="target"', { |