Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h

Issue 18314006: Enable DMP for system Chromium WebView on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do not indent preprocessor directives Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h
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 3b858caa444261e5d36e6586fb3f39eb46c29907..feefe0ca45fa69b22a0617a36ef1313799ae6cc4 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,7 +94,12 @@ 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
« no previous file with comments | « third_party/tcmalloc/chromium/src/heap-profiler.cc ('k') | third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698