| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index d09d8ab5dd8ad14336901c314abc4d9446000e06..abc45e370956dd5ef025e0fb07d3aad4c9514465 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -955,6 +955,7 @@
|
|
|
| # Enable TCMalloc.
|
| 'linux_use_tcmalloc%': 1,
|
| + 'android_use_tcmalloc%': 0,
|
|
|
| # Disable TCMalloc's heapchecker.
|
| 'linux_use_heapchecker%': 0,
|
| @@ -3223,7 +3224,7 @@
|
| }],
|
| ],
|
| }],
|
| - ['linux_use_tcmalloc==0', {
|
| + ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', {
|
| 'defines': ['NO_TCMALLOC'],
|
| }],
|
| ['linux_keep_shadow_stacks==1', {
|
|
|