[ASan] fix names of malloc/free replacements on Android

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@161322 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_malloc_linux.cc b/lib/asan/asan_malloc_linux.cc
index 1046f4c..1fe848d 100644
--- a/lib/asan/asan_malloc_linux.cc
+++ b/lib/asan/asan_malloc_linux.cc
@@ -21,6 +21,12 @@
 #include "asan_stack.h"
 
 #ifdef ANDROID
+DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size);
+DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr);
+DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size);
+DECLARE_REAL_AND_INTERCEPTOR(void*, realloc, void *ptr, uptr size);
+DECLARE_REAL_AND_INTERCEPTOR(void*, memalign, uptr boundary, uptr size);
+
 struct MallocDebug {
   void* (*malloc)(uptr bytes);
   void  (*free)(void* mem);
@@ -30,7 +36,7 @@
 };
 
 const MallocDebug asan_malloc_dispatch ALIGNED(32) = {
-  malloc, free, calloc, realloc, memalign
+  WRAP(malloc), WRAP(free), WRAP(calloc), WRAP(realloc), WRAP(memalign)
 };
 
 extern "C" const MallocDebug* __libc_malloc_dispatch;