diff options
| -rw-r--r-- | build/build_config.h | 7 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/build/build_config.h b/build/build_config.h index 97b0b5a..7784bb6 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -71,11 +71,6 @@ #define USE_TCMALLOC 1 #endif -// Use heapchecker. -#if defined(OS_LINUX) && !defined(NO_HEAPCHECKER) -#define USE_HEAPCHECKER 1 -#endif - // Compiler detection. #if defined(__GNUC__) #define COMPILER_GCC 1 diff --git a/build/common.gypi b/build/common.gypi index 183e5a0..04344b6 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2046,13 +2046,11 @@ }], ['linux_use_heapchecker==1', { 'variables': {'linux_use_tcmalloc%': 1}, + 'defines': ['USE_HEAPCHECKER'], }], ['linux_use_tcmalloc==0', { 'defines': ['NO_TCMALLOC'], }], - ['linux_use_heapchecker==0', { - 'defines': ['NO_HEAPCHECKER'], - }], ['linux_keep_shadow_stacks==1', { 'defines': ['KEEP_SHADOW_STACKS'], 'cflags': ['-finstrument-functions'], |