summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-04 15:18:36 -0700
committerElliott Hughes <enh@google.com>2014-06-04 15:20:46 -0700
commit14442bb22955f704091f23e670ed9f8bdcda1ce9 (patch)
treeba4957c763cde5450457bcd811f6dd8223f8e4a5
parent38732aa9ea28b54d55c46b6b1f9367cb8fa147f1 (diff)
downloadbionic-14442bb22955f704091f23e670ed9f8bdcda1ce9.zip
bionic-14442bb22955f704091f23e670ed9f8bdcda1ce9.tar.gz
bionic-14442bb22955f704091f23e670ed9f8bdcda1ce9.tar.bz2
Temporary fix for asan_malloc_linux.cc build failure.
Bug: 15432753 Change-Id: I02a3a2c826e6d01e6809c51588a9670dcd179123
-rw-r--r--libc/bionic/malloc_debug_common.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/bionic/malloc_debug_common.cpp b/libc/bionic/malloc_debug_common.cpp
index 19524bb..77ec080 100644
--- a/libc/bionic/malloc_debug_common.cpp
+++ b/libc/bionic/malloc_debug_common.cpp
@@ -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