Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: ui/views/views.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 48931d16af33c05fa0f17e60b150c71950edb05b..18a9421598d61eca33618d434ce210428057b287 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -825,7 +825,8 @@
'../../base/allocator/allocator.gyp:allocator',
],
}],
- ['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))', {
# See http://crbug.com/162998#c4 for why this is needed.
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
« ui/keyboard/keyboard.gyp ('K') | « ui/ui_unittests.gyp ('k') | url/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698