| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 9767abb8ed01c3d009e3fcd9bb5ba760c512d1a7..0a515d79e5eba4773847ca98ec3b88652c538207 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -941,6 +941,7 @@
|
|
|
| # Enable TCMalloc.
|
| 'linux_use_tcmalloc%': 1,
|
| + 'android_use_tcmalloc%': 0,
|
|
|
| # Disable TCMalloc's heapchecker.
|
| 'linux_use_heapchecker%': 0,
|
| @@ -3232,7 +3233,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', {
|
|
|