| Index: base/base.gypi
|
| ===================================================================
|
| --- base/base.gypi (revision 51321)
|
| +++ base/base.gypi (working copy)
|
| @@ -463,17 +463,6 @@
|
| 'sources/': [ ['include', '_chromeos\\.cc$'] ]
|
| },
|
| ],
|
| - [ 'linux_use_tcmalloc==0', {
|
| - 'defines': [
|
| - 'NO_TCMALLOC',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'NO_TCMALLOC',
|
| - ],
|
| - },
|
| - },
|
| - ],
|
| ],
|
| 'defines': [
|
| 'USE_SYMBOLIZE',
|
| @@ -530,6 +519,17 @@
|
| 'conditions': [
|
| [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
|
| 'conditions': [
|
| + [ 'linux_use_tcmalloc==0', {
|
| + 'defines': [
|
| + 'NO_TCMALLOC',
|
| + ],
|
| + 'direct_dependent_settings': {
|
| + 'defines': [
|
| + 'NO_TCMALLOC',
|
| + ],
|
| + },
|
| + },
|
| + ],
|
| [ 'linux_use_tcmalloc==1', {
|
| 'dependencies': [
|
| 'allocator/allocator.gyp:allocator',
|
|
|