| Index: base/allocator/allocator.gyp
|
| diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
|
| index d10fd49d547388807b60667ef55cd99edd0cfd93..ea5ff849cfb901cea54769b144040b31a0f2fbd2 100644
|
| --- a/base/allocator/allocator.gyp
|
| +++ b/base/allocator/allocator.gyp
|
| @@ -367,8 +367,8 @@
|
| # so only one of them should be used.
|
| '<(tcmalloc_dir)/src/tcmalloc.cc',
|
| ],
|
| - 'cflags': [
|
| - '-DTCMALLOC_FOR_DEBUGALLOCATION',
|
| + 'defines': [
|
| + 'TCMALLOC_FOR_DEBUGALLOCATION',
|
| ],
|
| }, { # linux_use_debugallocation != 1
|
| 'sources!': [
|
| @@ -383,7 +383,9 @@
|
| ],
|
| 'cflags': [
|
| '-finstrument-functions',
|
| - '-DKEEP_SHADOW_STACKS',
|
| + ],
|
| + 'defines': [
|
| + 'KEEP_SHADOW_STACKS',
|
| ],
|
| }],
|
| [ 'linux_use_heapchecker==0', {
|
| @@ -393,8 +395,8 @@
|
| '<(tcmalloc_dir)/src/heap-checker.cc',
|
| ],
|
| # Disable the heap checker in tcmalloc.
|
| - 'cflags': [
|
| - '-DNO_HEAP_CHECK',
|
| + 'defines': [
|
| + 'NO_HEAP_CHECK',
|
| ],
|
| }],
|
| ],
|
|
|