| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 2433392a2c1287d5fcad8be7820151add9448d8f..7fba9db843f9aca24c4ea967d5c8536d91f3586d 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -960,6 +960,7 @@
|
|
|
| # Enable TCMalloc.
|
| 'linux_use_tcmalloc%': 1,
|
| + 'android_use_tcmalloc%': 0,
|
|
|
| # Disable TCMalloc's heapchecker.
|
| 'linux_use_heapchecker%': 0,
|
| @@ -3251,7 +3252,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', {
|
|
|