| Index: chrome/chrome_android.gypi
|
| diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
|
| index 1109343998186e4a994e33da37a41ef8d6818bd6..48e8cdb08593cb8da12b1da5aaf9ae45a6136f23 100644
|
| --- a/chrome/chrome_android.gypi
|
| +++ b/chrome/chrome_android.gypi
|
| @@ -39,7 +39,8 @@
|
| }],
|
| ],
|
| }],
|
| - [ 'android_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554
|
| + [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator', ],
|
| }],
|
|
|