third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h - Issue 18314006: Enable DMP for system Chromium WebView on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Using a compiler define for detecting build type 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:

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..63f4d6bbcbbe3f9b9ee2a494be1d29f6c69517f4 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_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