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

Unified Diff: components/components_tests.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: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 0d87ab6a889880b37e917f3ebb9327b053132e32..b239088660532d166c7079c6f76a6a5eb24cf714 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -344,7 +344,8 @@
'../base/allocator/allocator.gyp:allocator',
],
}],
- ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['OS=="linux" and component=="shared_library" 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',
],
« no previous file with comments | « cloud_print/cloud_print.gyp ('k') | components/nacl.gyp » ('j') | ui/keyboard/keyboard.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698