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 |