diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 15:17:03 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 15:17:03 +0000 |
| commit | 3c8fe548ff6db60540aa8ee976801b10aa5a3d0f (patch) | |
| tree | 9647c10d33d0116bbc5b83f27058256b111d553d /build | |
| parent | e1f5c3267b075fef9be9db1533254349014638ed (diff) | |
| download | chromium_src-3c8fe548ff6db60540aa8ee976801b10aa5a3d0f.zip chromium_src-3c8fe548ff6db60540aa8ee976801b10aa5a3d0f.tar.gz chromium_src-3c8fe548ff6db60540aa8ee976801b10aa5a3d0f.tar.bz2 | |
Adds TCMalloc support for Android.
This is part of the effort to bring TCMalloc to android.
The first goal is to get instrumentation to facilitate
integration with DMP and memory profiling.
This is not yet intended for full production usage as the
default allocator.
BUG=162208
Review URL: https://chromiumcodereview.appspot.com/14321006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 3 | ||||
| -rw-r--r-- | build/common.gypi | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/build_config.h b/build/build_config.h index fef6be5..ea5da2c 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -69,7 +69,8 @@ #endif // Use tcmalloc -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)) && \ + !defined(NO_TCMALLOC) #define USE_TCMALLOC 1 #endif diff --git a/build/common.gypi b/build/common.gypi index 95ce2db..e71eff0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -955,6 +955,7 @@ # Enable TCMalloc. 'linux_use_tcmalloc%': 1, + 'android_use_tcmalloc%': 0, # Disable TCMalloc's heapchecker. 'linux_use_heapchecker%': 0, @@ -3223,7 +3224,7 @@ }], ], }], - ['linux_use_tcmalloc==0', { + ['linux_use_tcmalloc==0 and android_use_tcmalloc==0', { 'defines': ['NO_TCMALLOC'], }], ['linux_keep_shadow_stacks==1', { |