aboutsummaryrefslogtreecommitdiffstats
path: root/libc/bionic/libc_init_dynamic.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2009-11-17 14:13:38 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2009-11-18 10:36:25 -0800
commitb74ceb25aae555570df64fa4d4076272733a9a20 (patch)
tree3bf49e716722b67f4b0f0bcb391156bf29fa6ad0 /libc/bionic/libc_init_dynamic.c
parente8870ffc965d553a885f63b26e724da279728b72 (diff)
downloadandroid_bionic-b74ceb25aae555570df64fa4d4076272733a9a20.tar.gz
android_bionic-b74ceb25aae555570df64fa4d4076272733a9a20.tar.bz2
android_bionic-b74ceb25aae555570df64fa4d4076272733a9a20.zip
Split libc_debug.so into two .so modules loaded on demand from libc.so
This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
Diffstat (limited to 'libc/bionic/libc_init_dynamic.c')
-rw-r--r--libc/bionic/libc_init_dynamic.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c
index b479b272f..682ebcfd3 100644
--- a/libc/bionic/libc_init_dynamic.c
+++ b/libc/bionic/libc_init_dynamic.c
@@ -52,8 +52,6 @@
#include "libc_init_common.h"
#include <bionic_tls.h>
-extern void malloc_debug_init();
-
/* We flag the __libc_preinit function as a constructor to ensure
* that its address is listed in libc.so's .init_array section.
* This ensures that the function is called by the dynamic linker
@@ -78,12 +76,11 @@ void __libc_prenit(void)
__libc_init_common(elfdata);
-#ifdef MALLOC_LEAK_CHECK
- /* setup malloc leak checker, requires system properties */
+ /* Setup malloc routines accordingly to the environment.
+ * Requires system properties
+ */
extern void malloc_debug_init(void);
malloc_debug_init();
-#endif
-
}
__noreturn void __libc_init(uintptr_t *elfdata,