diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-04 22:21:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-04 22:21:13 +0000 |
| commit | 53e3bbab07f8d410418f87007177d5ad81e38bcf (patch) | |
| tree | ba4957c763cde5450457bcd811f6dd8223f8e4a5 | |
| parent | 38732aa9ea28b54d55c46b6b1f9367cb8fa147f1 (diff) | |
| parent | 14442bb22955f704091f23e670ed9f8bdcda1ce9 (diff) | |
| download | bionic-53e3bbab07f8d410418f87007177d5ad81e38bcf.zip bionic-53e3bbab07f8d410418f87007177d5ad81e38bcf.tar.gz bionic-53e3bbab07f8d410418f87007177d5ad81e38bcf.tar.bz2 | |
Merge "Temporary fix for asan_malloc_linux.cc build failure."
| -rw-r--r-- | libc/bionic/malloc_debug_common.cpp | 3 |
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 |