chromium/src
0
Fork 0
Code Activity

Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium.

Browse Source 
If this change breaks some bots, please try restarting the 
bot before reverting it. http://crrev.com/264460 may not be 
effective yet until restarting.

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

BUG=345554

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268876 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
dmikurube@chromium.org
2014-05-07 18:45:59 +00:00
parent 8c550bd1ca
commit 2fa89ef4d2
44 changed files with 72 additions and 135 deletions

3
ash/ash.gyp

@ -1063,8 +1063,7 @@
['exclude', 'display/resolution_notification_controller_unittest.cc'],
],
}],
# 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))', {
['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],

6
base/base.gyp

@ -143,8 +143,7 @@
],
},
'conditions': [
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', {
['use_allocator!="tcmalloc"', {
'defines': [
'NO_TCMALLOC',
],
@ -700,8 +699,7 @@
'message_loop/message_pump_glib_unittest.cc',
]
}],
# 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))', {
['OS == "linux" and use_allocator!="none"', {
'dependencies': [
'allocator/allocator.gyp:allocator',
],

37
build/common.gypi

@ -820,10 +820,7 @@
['OS=="linux" and target_arch=="arm" and chromeos==0', {
# Set some defaults for arm/linux chrome builds
# TODO(dmikurube): Change the default of use_allocator to "none".
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
'linux_use_tcmalloc%': 0,
'use_allocator%': 'see_use_tcmalloc',
'use_allocator%': 'none',
# sysroot needs to be an absolute path otherwise it generates
# incorrect results when passed to pkg-config
'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
@ -1222,15 +1219,8 @@
'binutils_dir%': '',
# Enable TCMalloc.
# TODO(dmikurube): Change Linux default of use_allocator to "tcmalloc".
# TODO(dmikurube): Change Android default of use_allocator to "none".
# TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
# {linux|android}_use_tcmalloc are to be replaced with use_allocator.
# They are now used only if use_allocator=="see_use_tcmalloc" (default).
# TODO(dmikurube): Assert when {linux|android}_use_tcmalloc is explicitly specified.
'linux_use_tcmalloc%': 1,
'android_use_tcmalloc%': 0,
'use_allocator%': 'see_use_tcmalloc',
# Default of 'use_allocator' is set to 'none' if OS=='android' later.
'use_allocator%': 'tcmalloc',
# Set to 1 to link against libgnome-keyring instead of using dlopen().
'linux_link_gnome_keyring%': 0,
@ -1460,10 +1450,7 @@
'werror%': '',
'disable_nacl%': 1,
'nacl_untrusted_build%': 0,
# TODO(dmikurube): Change the default of use_allocator to "none".
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
'linux_use_tcmalloc%': 0,
'use_allocator%': 'see_use_tcmalloc',
'use_allocator%': 'none',
}],
['OS=="linux" and target_arch=="mipsel"', {
'sysroot%': '<(sysroot)',
@ -1650,10 +1637,7 @@
'input_speech%': 0,
'java_bridge%': 1,
'build_ffmpegsumo%': 0,
# TODO(dmikurube): Change the default of use_allocator to "none".
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
'linux_use_tcmalloc%': 0,
'use_allocator%': 'see_use_tcmalloc',
'use_allocator%': 'none',
# Disable Native Client.
'disable_nacl%': 1,
@ -2043,10 +2027,7 @@
'win_release_InlineFunctionExpansion': '0',
'win_release_OmitFramePointers': '0',
# TODO(dmikurube): Change the default of use_allocator to "tcmalloc".
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
'linux_use_tcmalloc%': 1,
'use_allocator': 'see_use_tcmalloc',
'use_allocator': 'tcmalloc',
'release_valgrind_build': 1,
'werror': '',
'component': 'static_library',
@ -2299,8 +2280,7 @@
'<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
],
}],
# 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)) and clang_type_profiler==1', {
['OS=="linux" and use_allocator!="none" and clang_type_profiler==1', {
'cflags_cc!': ['-fno-rtti'],
'cflags_cc+': [
'-frtti',
@ -3865,8 +3845,7 @@
}],
],
}],
# TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or ((OS=="linux" and linux_use_tcmalloc==0) or (OS=="android" and android_use_tcmalloc==0)))', {
['use_allocator!="tcmalloc"', {
'defines': ['NO_TCMALLOC'],
}],
['linux_use_gold_flags==1', {

11
build/gyp_chromium

@ -277,6 +277,17 @@ if __name__ == '__main__':
supplemental_includes = GetSupplementalFiles()
gyp_vars_dict = GetGypVars(supplemental_includes)
# TODO(dmikurube): Remove these checks and messages after a while.
if ('linux_use_tcmalloc' in gyp_vars_dict or
'android_use_tcmalloc' in gyp_vars_dict):
print '*****************************************************************'
print '"linux_use_tcmalloc" and "android_use_tcmalloc" are deprecated!'
print '-----------------------------------------------------------------'
print 'You specify "linux_use_tcmalloc" or "android_use_tcmalloc" in'
print 'your GYP_DEFINES. Please switch them into "use_allocator" now.'
print 'See http://crbug.com/345554 for the details.'
print '*****************************************************************'
# Automatically turn on crosscompile support for platforms that need it.
# (The Chrome OS build sets CC_host / CC_target which implicitly enables
# this mode.)

6
cc/cc_tests.gyp

@ -268,8 +268,7 @@
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
{
'conditions': [
# 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)',
[ 'use_allocator!="none"',
{
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
@ -328,8 +327,7 @@
}
],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))',
['OS=="linux" and use_allocator!="none"',
{
'dependencies': [
'../base/allocator/allocator.gyp:allocator',

3
chrome/chrome_android.gypi

@ -39,8 +39,7 @@
}],
],
}],
# TODO(dmikurube): Kill android_use_tcmalloc. http://crbug.com/345554
[ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and android_use_tcmalloc==1)', {
[ 'use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator', ],
}],

3
chrome/chrome_exe.gypi

@ -141,8 +141,7 @@
},
],
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'<(allocator_target)',
],

9
chrome/chrome_tests.gypi

@ -1875,8 +1875,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -2148,8 +2147,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -2659,8 +2657,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
chrome/chrome_tests_unit.gypi

@ -2349,8 +2349,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
chromeos/chromeos.gyp

@ -547,8 +547,7 @@
'..',
],
'conditions': [
# 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)', {
[ 'use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
cloud_print/cloud_print.gyp

@ -52,8 +52,7 @@
],
}],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
components/components_tests.gyp

@ -445,8 +445,7 @@
'../base/allocator/allocator.gyp:allocator',
],
}],
# 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))', {
['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],

3
components/nacl.gyp

@ -307,8 +307,7 @@
}],
['os_posix == 1 and OS != "mac"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
content/content_app.gypi

@ -35,8 +35,7 @@
'public/app/startup_helper_win.h',
],
'conditions': [
# TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', {
'dependencies': [
# This is needed by app/content_main_runner.cc
'../base/allocator/allocator.gyp:allocator',

3
content/content_shell.gypi

@ -299,8 +299,7 @@
'../components/components.gyp:breakpad_host',
],
}],
# TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554
['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', {
['(OS=="linux" or OS=="android") and use_allocator!="none"', {
'dependencies': [
# This is needed by content/app/content_main_runner.cc
'../base/allocator/allocator.gyp:allocator',

3
content/content_tests.gypi

@ -1411,10 +1411,9 @@
'<(angle_path)/src/build_angle.gyp:libGLESv2',
],
}],
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
['(OS=="win" and win_use_allocator_shim==1) or '
'(os_posix == 1 and OS != "android" and '
' ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', {
' use_allocator!="none")', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
courgette/courgette.gyp

@ -121,8 +121,7 @@
'conditions': [
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
crypto/crypto.gyp

@ -180,8 +180,7 @@
'conditions': [
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
[ 'use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
device/device_tests.gyp

@ -59,8 +59,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
gpu/gles2_conform_support/gles2_conform_support.gyp

@ -107,8 +107,7 @@
],
'conditions': [
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
],

3
gpu/gpu.gyp

@ -287,8 +287,7 @@
],
}],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

6
ipc/BUILD.gn

@ -114,8 +114,7 @@ if (!is_android) {
# TODO(brettw) hook up tcmalloc to this target.
#if (is_posix && !is_mac && !is_android) {
# # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
# if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
# if (use_allocator!="none") {
# deps += "/base/allocator"
# }
#}
@ -145,8 +144,7 @@ if (!is_android) {
# TODO(brettw) hook up tcmalloc to this target.
#if (is_posix && !is_mac && !is_android) {
# # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
# if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc)) {
# if (use_allocator!="none") {
# deps += "//base/allocator"
# }
#}

6
ipc/ipc.gyp

@ -74,8 +74,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -113,8 +112,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

6
media/media.gyp

@ -1105,8 +1105,7 @@
}],
['os_posix==1 and OS!="mac"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -1699,8 +1698,7 @@
'conditions': [
['os_posix==1 and OS!="mac"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

6
net/net.gyp

@ -551,8 +551,7 @@
}],
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -911,8 +910,7 @@
}],
['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

6
ppapi/ppapi_tests.gypi

@ -126,8 +126,7 @@
],
'conditions': [
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -191,8 +190,7 @@
'conditions': [
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
[ 'use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
printing/printing.gyp

@ -247,8 +247,7 @@
}],
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

9
remoting/remoting_host.gypi

@ -752,8 +752,7 @@
}], # mac_breakpad==1
], # conditions
}], # OS=mac
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -784,8 +783,7 @@
'host/setup/me2me_native_messaging_host_main.h',
],
'conditions': [
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
@ -877,8 +875,7 @@
'../build/linux/system.gyp:gtk',
],
}],
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
remoting/remoting_host_linux.gypi

@ -128,8 +128,7 @@
'host/setup/start_host.cc',
],
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
remoting/remoting_test.gypi

@ -230,8 +230,7 @@
['exclude', '^base/resources_unittest\\.cc$'],
]
}],
# 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))', {
[ 'OS == "linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
sql/sql.gyp

@ -99,8 +99,7 @@
'conditions': [
['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
sync/sync_tests.gypi

@ -505,8 +505,7 @@
# TODO(akalin): This is needed because histogram.cc uses
# leak_annotations.h, which pulls this in. Make 'base'
# propagate this dependency.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
ui/app_list/app_list.gyp

@ -258,8 +258,7 @@
],
}],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
# The following two dependencies provide the missing

3
ui/aura/aura.gyp

@ -285,8 +285,7 @@
'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
],
}],
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
# See http://crbug.com/162998#c4 for why this is needed.
'../../base/allocator/allocator.gyp:allocator',

3
ui/compositor/compositor.gyp

@ -162,8 +162,7 @@
}],
['os_posix == 1 and OS != "mac"', {
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],

3
ui/events/events.gyp

@ -363,8 +363,7 @@
'x/events_x_unittest.cc',
],
'conditions': [
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],

3
ui/keyboard/keyboard.gyp

@ -99,8 +99,7 @@
'keyboard_controller_unittest.cc',
],
'conditions': [
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],

3
ui/message_center/message_center.gyp

@ -235,8 +235,7 @@
],
}],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
],

3
ui/snapshot/snapshot.gyp

@ -72,8 +72,7 @@
],
}],
# See http://crbug.com/162998#c4 for why this is needed.
# 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))', {
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',
],

3
ui/ui_unittests.gyp

@ -154,8 +154,7 @@
'gfx/platform_font_pango_unittest.cc',
],
'conditions': [
# 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)', {
['use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],

3
ui/views/views.gyp

@ -700,8 +700,7 @@
'../../base/allocator/allocator.gyp:allocator',
],
}],
# 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))', {
['OS=="linux" and use_allocator!="none"', {
# See http://crbug.com/162998#c4 for why this is needed.
'dependencies': [
'../../base/allocator/allocator.gyp:allocator',

3
url/BUILD.gn

@ -101,8 +101,7 @@ if (!is_android) {
]
#if (is_posix && !is_mac && !is_ios) {
# # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
# if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc) {
# if (use_allocator!="none") {
# deps += "//base/allocator"
# }
#}

3
url/url.gyp

@ -77,8 +77,7 @@
'url_util_unittest.cc',
],
'conditions': [
# TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
['os_posix==1 and OS!="mac" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))',
['os_posix==1 and OS!="mac" and OS!="ios" and use_allocator!="none"',
{
'dependencies': [
'../base/allocator/allocator.gyp:allocator',

3
webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp

@ -39,8 +39,7 @@
}],
[ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
'conditions': [
# 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)', {
[ 'use_allocator!="none"', {
'dependencies': [
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],