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

Unified Diff: device/device_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
« no previous file with comments | « crypto/crypto.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/device_tests.gyp
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index 63c0a820737f1ed0c702a9bab26d3c7607f4cca7..0cadffb86154b5e24bacc9eacea816c0bbc9ef0d 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -56,7 +56,8 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
- ['linux_use_tcmalloc == 1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
« no previous file with comments | « crypto/crypto.gyp ('k') | gpu/gles2_conform_support/gles2_conform_support.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698