diff options
44 files changed, 132 insertions, 59 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 6654328..f970de5 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1025,7 +1025,8 @@ ['exclude', 'display/resolution_notification_controller_unittest.cc'], ], }], - ['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', ], diff --git a/base/base.gyp b/base/base.gyp index 114d119..72164e0 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -180,7 +180,8 @@ ], }, 'conditions': [ - ['linux_use_tcmalloc==0', { + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 + ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)', { 'defines': [ 'NO_TCMALLOC', ], @@ -755,7 +756,8 @@ 'message_loop/message_pump_glib_unittest.cc', ] }], - ['OS == "linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ 'allocator/allocator.gyp:allocator', ], diff --git a/base/security_unittest.cc b/base/security_unittest.cc index ae0847b..d613f34c 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -42,7 +42,7 @@ Type HideValueFromCompiler(volatile Type value) { return value; } -// - NO_TCMALLOC (should be defined if we compile with linux_use_tcmalloc=0) +// - NO_TCMALLOC (should be defined if compiled with use_allocator!="tcmalloc") // - ADDRESS_SANITIZER because it has its own memory allocator // - IOS does not use tcmalloc // - OS_MACOSX does not use tcmalloc diff --git a/build/common.gypi b/build/common.gypi index d4a8ea2..0747087 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -753,7 +753,10 @@ ['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', # sysroot needs to be an absolute path otherwise it generates # incorrect results when passed to pkg-config 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', @@ -1133,8 +1136,14 @@ 'release_unwind_tables%': 1, # Enable TCMalloc. + # TODO(dmikurube): Change the default of use_allocator to "tcmalloc". + # TODO(dmikurube): Kill linux_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_use_tcmalloc is explicitly specified. 'linux_use_tcmalloc%': 1, 'android_use_tcmalloc%': 0, + 'use_allocator%': 'see_use_tcmalloc', # Set to 1 to link against libgnome-keyring instead of using dlopen(). 'linux_link_gnome_keyring%': 0, @@ -1316,7 +1325,10 @@ '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', }], ['OS=="linux" and target_arch=="mipsel"', { 'sysroot%': '<(sysroot)', @@ -1481,7 +1493,10 @@ 'enable_automation%': 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', # Disable Native Client. 'disable_nacl%': 1, @@ -1876,7 +1891,10 @@ 'win_release_InlineFunctionExpansion': '0', 'win_release_OmitFramePointers': '0', - 'linux_use_tcmalloc': 1, + # 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', 'release_valgrind_build': 1, 'werror': '', 'component': 'static_library', @@ -2123,7 +2141,8 @@ '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', ], }], - ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { + # 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', { 'cflags_cc!': ['-fno-rtti'], 'cflags_cc+': [ '-frtti', @@ -3664,7 +3683,8 @@ }], ], }], - ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', { + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 + ['(use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" or linux_use_tcmalloc==0)) and android_use_tcmalloc==0', { 'defines': ['NO_TCMALLOC'], }], ['linux_use_gold_flags==1', { diff --git a/build/gyp_chromium b/build/gyp_chromium index 5ada989..b06552d 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -192,7 +192,7 @@ def GetArgsStringForGN(vars_dict): # order_text_section=<path> http://crbug.com/330299 # chromium_win_pch=0 http://crbug.com/297678 # chromium_ios_signing=0 http://crbug.com/330302 - # linux_use_tcmalloc=0 http://crbug.com/330303 + # use_allocator=tcmalloc http://crbug.com/330303, 345554 # release_extra_flags=... http://crbug.com/330305 # These tuples of (key, value, gn_arg_string) use the gn_arg_string for diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index ec679d1..100cfba 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -257,7 +257,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', @@ -314,7 +315,8 @@ } ], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 4bf28c8..a89eafa 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -142,7 +142,8 @@ }, ], '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': [ '<(allocator_target)', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 422c4aa..f22bd13 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1971,7 +1971,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], @@ -2216,7 +2217,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], @@ -2305,7 +2307,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], @@ -2927,7 +2930,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index bd8d99b..4bb52ff 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2372,7 +2372,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { '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', ], diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 2dda381..602d6a8 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -527,7 +527,8 @@ '..', ], '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', ], diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp index 7d1b3ce..feb8311 100644 --- a/cloud_print/cloud_print.gyp +++ b/cloud_print/cloud_print.gyp @@ -52,7 +52,8 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], diff --git a/components/components_tests.gyp b/components/components_tests.gyp index da10a97..d590839 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -348,7 +348,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', ], diff --git a/components/nacl.gyp b/components/nacl.gyp index ea9da55..990221e 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -233,7 +233,8 @@ }], ['os_posix == 1 and OS != "mac"', { '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', ], diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 00f3c86..56981a2 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -315,7 +315,8 @@ '../components/components.gyp:breakpad_host', ], }], - ['(os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (android_use_tcmalloc==1)', { + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 + ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)))', { 'dependencies': [ # This is needed by content/app/content_main_runner.cc '../base/allocator/allocator.gyp:allocator', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 907b756..0763fbd 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1311,9 +1311,10 @@ '<(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 ' - ' linux_use_tcmalloc==1)', { + ' ((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', ], diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index fbd1ced..591e4e2 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -121,7 +121,8 @@ 'conditions': [ [ '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', ], diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 1f22aa9..cb71fb0 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -277,7 +277,8 @@ 'conditions': [ [ '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', ], diff --git a/device/device_tests.gyp b/device/device_tests.gyp index 63c0a82..0cadffb 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', ], diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 20a283f..18ad18b 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -121,7 +121,8 @@ 'dependencies': ['../../build/linux/system.gyp:gtk'], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../../base/allocator/allocator.gyp:allocator', ], diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 477e62a..322a3c0 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -264,7 +264,8 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index e546a99..c5c5185 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -79,7 +79,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], @@ -122,7 +123,8 @@ }], ['os_posix == 1 and OS != "mac" and OS != "android"', { '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', ], diff --git a/media/media.gyp b/media/media.gyp index f448ff0..030049f 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1074,7 +1074,8 @@ }], ['os_posix==1 and OS!="mac"', { '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', ], @@ -1640,7 +1641,8 @@ '../build/linux/system.gyp:gtk', ], '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', ], @@ -1668,7 +1670,8 @@ 'conditions': [ ['os_posix==1 and OS!="mac"', { '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', ], diff --git a/net/net.gyp b/net/net.gyp index 13fd739..a9413f7 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2201,7 +2201,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', ], @@ -2549,7 +2550,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', ], diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 642f459..f9447d4 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -125,7 +125,8 @@ ], 'conditions': [ # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -202,7 +203,8 @@ 'conditions': [ [ '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', ], diff --git a/printing/printing.gyp b/printing/printing.gyp index adcab4b..f12e079 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -275,7 +275,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', ], diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 3a02439..40b00c9 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -743,7 +743,8 @@ }], # mac_breakpad==1 ], # conditions }], # OS=mac - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -769,7 +770,8 @@ 'host/setup/me2me_native_messaging_host_main.h', ], 'conditions': [ - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], @@ -801,7 +803,8 @@ '../build/linux/system.gyp:gtk', ], }], - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], diff --git a/remoting/remoting_host_linux.gypi b/remoting/remoting_host_linux.gypi index 6f01138..e27faf8 100644 --- a/remoting/remoting_host_linux.gypi +++ b/remoting/remoting_host_linux.gypi @@ -127,7 +127,8 @@ 'host/setup/start_host.cc', ], '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', ], diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 2ef35a4a..45860e8 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -229,7 +229,8 @@ ['exclude', '^base/resources_unittest\\.cc$'], ] }], - [ 'OS == "linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], diff --git a/sql/sql.gyp b/sql/sql.gyp index 7add51c..0d861a8 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -99,7 +99,8 @@ 'conditions': [ ['os_posix==1 and OS!="mac" 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', ], diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index 5b6ed10..d3d8562 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -490,7 +490,8 @@ # TODO(akalin): This is needed because histogram.cc uses # leak_annotations.h, which pulls this in. Make 'base' # propagate this dependency. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], diff --git a/tools/cygprofile/cygprofile.cc b/tools/cygprofile/cygprofile.cc index 06e74b8..2086bea 100644 --- a/tools/cygprofile/cygprofile.cc +++ b/tools/cygprofile/cygprofile.cc @@ -12,7 +12,7 @@ // Special thread is created in the process to periodically flushes logs for all // threads for the case the thread has stopped before flushing its logs. // -// Use this profiler with linux_use_tcmalloc=0. +// Use this profiler with use_allocator!="none". // // Note for the ChromeOS Chrome. Remove renderer process from the sandbox (add // --no-sandbox option to running Chrome in /sbin/session_manager_setup.sh). diff --git a/tools/gn/secondary/ipc/BUILD.gn b/tools/gn/secondary/ipc/BUILD.gn index 022bbf2..ae3897a 100644 --- a/tools/gn/secondary/ipc/BUILD.gn +++ b/tools/gn/secondary/ipc/BUILD.gn @@ -105,7 +105,8 @@ test("ipc_tests") { # deps += "/testing/android/native_test.gyp:native_testNative_code" #} #if (is_posix && !is_mac && !is_android) { - # if (linux_use_tcmalloc) { + # # 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)) { # deps += "/base/allocator" # } #} @@ -133,7 +134,8 @@ test("ipc_perftests") { # deps += "/testing/android/native_test.gyp:native_testNative_code" #} #if (is_posix && !is_mac && !is_android) { - # if (linux_use_tcmalloc) { + # # 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)) { # deps += "//base/allocator" # } #} diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index f5aa616..284cc71 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -261,7 +261,8 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../../base/allocator/allocator.gyp:allocator', # The following two dependencies provide the missing diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 43f81ef..f3de1fb 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -281,7 +281,8 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ # See http://crbug.com/162998#c4 for why this is needed. '../../base/allocator/allocator.gyp:allocator', diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index fbd62ef..8bdaf00 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -160,7 +160,8 @@ }], ['os_posix == 1 and OS != "mac"', { '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': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], diff --git a/ui/events/events.gyp b/ui/events/events.gyp index e303005..61e646a 100644 --- a/ui/events/events.gyp +++ b/ui/events/events.gyp @@ -283,7 +283,8 @@ 'x/events_x_unittest.cc', ], 'conditions': [ - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 97ea950..5de6ae0 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -100,7 +100,8 @@ 'keyboard_controller_unittest.cc', ], 'conditions': [ - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index beda0c7e..8301a16 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -235,7 +235,8 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../../base/allocator/allocator.gyp:allocator', ], diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index 95f2dac..f556772 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -72,7 +72,8 @@ ], }], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { 'dependencies': [ '../../base/allocator/allocator.gyp:allocator', ], diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index a142c7d..4517662 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -246,7 +246,8 @@ 'gfx/platform_font_pango_unittest.cc', ], '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', ], diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 58cc624..2b04cd1 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -822,7 +822,8 @@ '../../base/allocator/allocator.gyp:allocator', ], }], - ['OS=="linux" and linux_use_tcmalloc==1', { + # 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))', { # See http://crbug.com/162998#c4 for why this is needed. 'dependencies': [ '../../base/allocator/allocator.gyp:allocator', diff --git a/url/BUILD.gn b/url/BUILD.gn index 941ba7d..e32d434 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -67,7 +67,8 @@ test("url_unittests") { ] #if (is_posix && !is_mac && !is_ios) { - # if (linux_use_tcmalloc) { + # # 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) { # deps += "//base/allocator" # } #} diff --git a/url/url.gyp b/url/url.gyp index d47748c..bb617f1 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -54,7 +54,8 @@ 'url_util_unittest.cc', ], 'conditions': [ - ['os_posix==1 and OS!="mac" 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!="ios" and ((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', diff --git a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp index 9c5018e..47014fb 100644 --- a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp +++ b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp @@ -39,7 +39,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': [ '<(DEPTH)/base/allocator/allocator.gyp:allocator', ], |