aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-08-12 16:21:26 -0700
committerDan Albert <danalbert@google.com>2014-08-12 16:53:14 -0700
commitedd81faff0b61fc458dc27b9c91f358d3313ce7a (patch)
tree75a100c4d5939b8b6b77274626e8994c0b92c8e8
parent00c16c1b921dfeab42eb92ac53c6d79addc9f549 (diff)
downloadandroid_bionic-edd81faff0b61fc458dc27b9c91f358d3313ce7a.tar.gz
android_bionic-edd81faff0b61fc458dc27b9c91f358d3313ce7a.tar.bz2
android_bionic-edd81faff0b61fc458dc27b9c91f358d3313ce7a.zip
Hide __libc_malloc_dispatch.
Now that -Bsymbolic is fixed, we can hide __libc_malloc_dispatch without breaking ASAN. Bug: 11156955 Change-Id: Ia2fc9b046a74e666b33aa6c6c5435f70a63b8021
-rw-r--r--libc/bionic/malloc_debug_common.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libc/bionic/malloc_debug_common.cpp b/libc/bionic/malloc_debug_common.cpp
index be16625b8..0b6a1421b 100644
--- a/libc/bionic/malloc_debug_common.cpp
+++ b/libc/bionic/malloc_debug_common.cpp
@@ -81,8 +81,7 @@ static const MallocDebug __libc_malloc_default_dispatch __attribute__((aligned(3
};
// Selector of dispatch table to use for dispatching malloc calls.
-// TODO: fix http://b/15432753 and make this static again.
-const MallocDebug* __libc_malloc_dispatch = &__libc_malloc_default_dispatch;
+static 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