generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 02255f26: am 53e3bbab: Merge "Temporary fix for asan_malloc_linux.cc build failure."

Browse Source 
* commit '02255f267448f88f16f3ddeaf5c701ab01a17c4b':
  Temporary fix for asan_malloc_linux.cc build failure.
This commit is contained in:
Elliott Hughes 2014-06-04 22:39:38 +00:00 committed by Android Git Automerger
commit c5a17834c4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/bionic/malloc_debug_common.cpp
View File

@ -60,7 +60,8 @@ static const MallocDebug __libc_malloc_default_dispatch __attribute__((aligned(3
}; };
// Selector of dispatch table to use for dispatching malloc calls. // Selector of dispatch table to use for dispatching malloc calls.
static const MallocDebug* __libc_malloc_dispatch = &__libc_malloc_default_dispatch; // TODO: fix http://b/15432753 and make this static again.
const MallocDebug* __libc_malloc_dispatch = &__libc_malloc_default_dispatch;
// Handle to shared library where actual memory allocation is implemented. // Handle to shared library where actual memory allocation is implemented.
// This library is loaded and memory allocation calls are redirected there // This library is loaded and memory allocation calls are redirected there