diff options
| author | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 15:41:24 +0000 |
|---|---|---|
| committer | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 15:41:24 +0000 |
| commit | d460114dfb3c91dab0218cacca889b93212d5a2e (patch) | |
| tree | 84f4a92871cf9ad698cf638f186ce43a01879c7d /third_party/tcmalloc | |
| parent | 09356c653d1417a7b8ab84f9b4a02a699ca311ff (diff) | |
| download | chromium_src-d460114dfb3c91dab0218cacca889b93212d5a2e.zip chromium_src-d460114dfb3c91dab0218cacca889b93212d5a2e.tar.gz chromium_src-d460114dfb3c91dab0218cacca889b93212d5a2e.tar.bz2 | |
Revert "Enable DMP for system Chromium WebView on Android"
This reverts commit a2f57e2cbfffa257ef542aa44807ee5d616cd15d.
(http://crrev.com/18314006)
Reason for the revert: it is not being actively used anymore, since
having tcmalloc in libwebviewchromium.so doens't help with allocations
from other libraries like system skia.
Also, some work on the android_use_tcmalloc is ongoing and this dead code
is adding unnecessary maintaining effort.
BUG=345554
Review URL: https://codereview.chromium.org/208263016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
4 files changed, 1 insertions, 10 deletions
diff --git a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h index ac1e797..bdbc4b7 100644 --- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h +++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h @@ -157,9 +157,7 @@ extern "C" { #include <sys/types.h> #if defined(__ANDROID__) #include <sys/syscall.h> -#ifndef ANDROID_NON_SDK_BUILD #include <sys/linux-syscalls.h> -#endif #else #include <syscall.h> #endif diff --git a/third_party/tcmalloc/chromium/src/heap-profiler.cc b/third_party/tcmalloc/chromium/src/heap-profiler.cc index d27e0b3..da4ed49 100644 --- a/third_party/tcmalloc/chromium/src/heap-profiler.cc +++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc @@ -671,7 +671,7 @@ static void HeapProfilerInit() { return; } // We do a uid check so we don't write out files in a setuid executable. -#if !defined(__ANDROID__) && defined(HAVE_GETEUID) +#ifdef HAVE_GETEUID if (getuid() != geteuid()) { RAW_LOG(WARNING, ("HeapProfiler: ignoring " HEAPPROFILE " because " "program seems to be setuid\n")); diff --git a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h index feefe0c..3b858ca 100644 --- a/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h +++ b/third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h @@ -94,12 +94,7 @@ extern "C" { struct mallinfo mallinfo(void) __THROW ALIAS(tc_mallinfo); #endif size_t malloc_size(void* p) __THROW ALIAS(tc_malloc_size); -#if defined(__ANDROID__) && defined(ANDROID_NON_SDK_BUILD) - // In Android tree this function is defined differently than in the NDK. - size_t malloc_usable_size(const void* p) __THROW ALIAS(tc_malloc_size); -#else size_t malloc_usable_size(void* p) __THROW ALIAS(tc_malloc_size); -#endif } // extern "C" #undef ALIAS diff --git a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h index 8b8b4ad..715c045 100644 --- a/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h +++ b/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h @@ -42,9 +42,7 @@ #include <unistd.h> #if defined(__ANDROID__) #include <sys/syscall.h> -#ifndef ANDROID_NON_SDK_BUILD #include <sys/linux-syscalls.h> -#endif #else #include <syscall.h> #endif |