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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14321006: Adds TCMalloc support for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« third_party/tcmalloc/chromium/src/base/sysinfo.cc ('K') | « third_party/tcmalloc/chromium/src/getpc.h ('k') | third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h » ('j') | third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/chromium/src/libc_override.h
diff --git a/third_party/tcmalloc/chromium/src/libc_override.h b/third_party/tcmalloc/chromium/src/libc_override.h
index 089084a2e4988d34fd0723f4d651f194e264a2c4..c69a15067afcfa552b4d76cb255cc4bf43f4fd10 100644
--- a/third_party/tcmalloc/chromium/src/libc_override.h
+++ b/third_party/tcmalloc/chromium/src/libc_override.h
@@ -84,7 +84,11 @@ static void ReplaceSystemAlloc() { }
// Not all gcc systems necessarily support weak symbols, but all the
// ones I know of do, so for now just assume they all do.
#elif defined(__GNUC__)
+#if defined (__ANDROID__)
+#include "libc_override_gcc_and_weak_bionic.h"
+#else
#include "libc_override_gcc_and_weak.h"
+#endif
#else
#error Need to add support for your libc/OS here
« third_party/tcmalloc/chromium/src/base/sysinfo.cc ('K') | « third_party/tcmalloc/chromium/src/getpc.h ('k') | third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h » ('j') | third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak_bionic.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698