diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 37 | ||||
| -rwxr-xr-x | build/gyp_chromium | 11 |
2 files changed, 19 insertions, 29 deletions
diff --git a/build/common.gypi b/build/common.gypi index efb8063..def3eaf 100644 --- a/build/common.gypi +++ b/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', { diff --git a/build/gyp_chromium b/build/gyp_chromium index 201e5a0..26028dc 100755 --- a/build/gyp_chromium +++ b/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.) |