| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 8e5569212b36eeea91d474174b6f4998ca1b2cbd..a2a54a8d43a7b21f028804e603207b4bb6519c7e 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -943,6 +943,7 @@
|
|
|
| # Enable TCMalloc.
|
| 'linux_use_tcmalloc%': 1,
|
| + 'android_use_tcmalloc%': 0,
|
|
|
| # Disable TCMalloc's heapchecker.
|
| 'linux_use_heapchecker%': 0,
|
| @@ -3231,7 +3232,7 @@
|
| 'variables': {'linux_use_tcmalloc%': 1},
|
| 'defines': ['USE_HEAPCHECKER'],
|
| }],
|
| - ['linux_use_tcmalloc==0', {
|
| + ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', {
|
| 'defines': ['NO_TCMALLOC'],
|
| }],
|
| ['linux_keep_shadow_stacks==1', {
|
|
|