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

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: Added a workaround for malloc_usable_size 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..40410c2cee768fabcfc26b6b3b169e5bf6071b75 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,13 @@ 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(__SIGN)
+ // This combination means that we are building inside the Android tree,
+ // which defines this function differently from 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

Powered by Google App Engine
This is Rietveld 408576698