Merge "Temporary fix for asan_malloc_linux.cc build failure."

This commit is contained in:
Elliott Hughes 2014-06-04 22:21:12 +00:00 committed by Gerrit Code Review
commit 53e3bbab07

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.
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.
// This library is loaded and memory allocation calls are redirected there