| Index: ui/keyboard/keyboard.gyp
|
| diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
|
| index 97ea950bf354f630304ed2cdc854bc78d5817781..5de6ae076a28ad19c5646e028195bb319adce57f 100644
|
| --- a/ui/keyboard/keyboard.gyp
|
| +++ b/ui/keyboard/keyboard.gyp
|
| @@ -100,7 +100,8 @@
|
| 'keyboard_controller_unittest.cc',
|
| ],
|
| 'conditions': [
|
| - ['OS=="linux" and linux_use_tcmalloc==1', {
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
|
| 'dependencies': [
|
| '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| ],
|
|
|