generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove references to MALLOC_LEAK_CHECK."

Browse Source
This commit is contained in:
Christopher Ferris 2014-09-20 00:29:09 +00:00 committed by Gerrit Code Review
commit e716044918
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/Android.mk
View File

@ -1120,10 +1120,7 @@ ifneq ($(TARGET_BUILD_VARIANT),user)
# ======================================================== # ========================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS := \ LOCAL_CFLAGS := $(libc_common_cflags)
$(libc_common_cflags) \
-DMALLOC_LEAK_CHECK \
LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_CPPFLAGS := $(libc_common_cppflags)

15
libc/bionic/malloc_debug_common.cpp
View File

@ -29,14 +29,13 @@
// Contains definition of structures, global variables, and implementation of // Contains definition of structures, global variables, and implementation of
// routines that are used by malloc leak detection code and other components in // routines that are used by malloc leak detection code and other components in
// the system. The trick is that some components expect these data and // the system. The trick is that some components expect these data and
// routines to be defined / implemented in libc.so library, regardless // routines to be defined / implemented in libc.so, regardless whether or not
// whether or not MALLOC_LEAK_CHECK macro is defined. To make things even // malloc leak detection code is going to run. To make things even more tricky,
// more tricky, malloc leak detection code, implemented in // malloc leak detection code, implemented in libc_malloc_debug.so also
// libc_malloc_debug.so also requires access to these variables and routines // requires access to these variables and routines (to fill allocation entry
// (to fill allocation entry hash table, for example). So, all relevant // hash table, for example). So, all relevant variables and routines are
// variables and routines are defined / implemented here and exported // defined / implemented here and exported to all, leak detection code and
// to all, leak detection code and other components via dynamic (libc.so), // other components via dynamic (libc.so), or static (libc.a) linking.
// or static (libc.a) linking.
#include "malloc_debug_common.h" #include "malloc_debug_common.h"

7
libc/bionic/malloc_debug_leak.cpp
View File

@ -55,13 +55,6 @@
#include "private/libc_logging.h" #include "private/libc_logging.h"
#include "private/ScopedPthreadMutexLocker.h" #include "private/ScopedPthreadMutexLocker.h"
// This file should be included into the build only when
// MALLOC_LEAK_CHECK, or MALLOC_QEMU_INSTRUMENT, or both
// macros are defined.
#ifndef MALLOC_LEAK_CHECK
#error MALLOC_LEAK_CHECK is not defined.
#endif // !MALLOC_LEAK_CHECK
extern int gMallocLeakZygoteChild; extern int gMallocLeakZygoteChild;
extern HashTable* g_hash_table; extern HashTable* g_hash_table;
extern const MallocDebug* g_malloc_dispatch; extern const MallocDebug* g_malloc_dispatch;