Enable use_allocator instead of linux_use_tcmalloc in Blink.

See the bug and http://crrev.com/255129 for the details.

BUG=345554
R=haraken@chromium.org, jamesr@chromium.org

Review URL: https://codereview.chromium.org/177053003

git-svn-id: svn://svn.chromium.org/blink/trunk@168591 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 45e5cb99
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
'<@(heap_test_files)', '<@(heap_test_files)',
], ],
'conditions': [ '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': [ 'dependencies': [
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
......
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
'<@(platform_test_files)', '<@(platform_test_files)',
], ],
'conditions': [ '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': [ 'dependencies': [
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
......
...@@ -169,7 +169,8 @@ ...@@ -169,7 +169,8 @@
'../../public/web/mac', '../../public/web/mac',
], ],
}], }],
[ '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': [ 'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
], ],
......
...@@ -46,7 +46,8 @@ ...@@ -46,7 +46,8 @@
# Disable c4267 warnings until we fix size_t to int truncations. # Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267],
'conditions': [ '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': [ 'dependencies': [
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/allocator/allocator.gyp:allocator', '<(DEPTH)/base/allocator/allocator.gyp:allocator',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment