Index: ui/app_list/app_list.gyp |
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp |
index 5bbfc77e8f17bf5ff18c0f553912818796c882c4..e8d42112297c47d8205d911cd435db6dddd9f2e1 100644 |
--- a/ui/app_list/app_list.gyp |
+++ b/ui/app_list/app_list.gyp |
@@ -317,17 +317,6 @@ |
['exclude', 'cocoa/'], |
], |
}], |
- # See http://crbug.com/162998#c4 for why this is needed. |
- ['OS=="linux" and use_allocator!="none"', { |
- 'dependencies': [ |
- '../../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
- ['OS=="win" and win_use_allocator_shim==1', { |
- 'dependencies': [ |
- '../../base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
], |
# Disable c4267 warnings until we fix size_t to int truncations. |
'msvs_disabled_warnings': [ 4267, ], |
@@ -370,11 +359,6 @@ |
'../../content/content.gyp:sandbox_helper_win', |
], |
}], |
- ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { |
- 'dependencies': [ |
- '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
- ], |
- }], |
], |
}, |
], |