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

Unified Diff: Source/platform/blink_platform_tests.gyp

Issue 177053003: Enable use_allocator instead of linux_use_tcmalloc in Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 6 years, 9 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 | « Source/heap/blink_heap_tests.gyp ('k') | Source/web/web_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/blink_platform_tests.gyp
diff --git a/Source/platform/blink_platform_tests.gyp b/Source/platform/blink_platform_tests.gyp
index ffad3968731befb40b52bef2cc235f3ae5b37f0d..fa9c986a4b613b4d87d588746d9fc5c5317fb348 100644
--- a/Source/platform/blink_platform_tests.gyp
+++ b/Source/platform/blink_platform_tests.gyp
@@ -55,7 +55,8 @@
'<@(platform_test_files)',
],
'conditions': [
- ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', {
+ # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
« no previous file with comments | « Source/heap/blink_heap_tests.gyp ('k') | Source/web/web_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698