diff options
| author | Iliyan Malchev <malchev@google.com> | 2012-06-02 08:35:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-02 08:35:07 -0700 |
| commit | 31431f454a9d3d3dde46de0e3c39cc409a39c436 (patch) | |
| tree | 6323e46ca9ba03d26b4dceb1acf9c3b9dc0675cf /libc/Android.mk | |
| parent | 143ad4cf31832537102ae8df7ad7360071b806af (diff) | |
| parent | 252a5c854a08e89fc7337ea679220161fe4ea98f (diff) | |
| download | bionic-31431f454a9d3d3dde46de0e3c39cc409a39c436.zip bionic-31431f454a9d3d3dde46de0e3c39cc409a39c436.tar.gz bionic-31431f454a9d3d3dde46de0e3c39cc409a39c436.tar.bz2 | |
am 252a5c85: resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp
* commit '252a5c854a08e89fc7337ea679220161fe4ea98f':
bionic: import heaptracker as chk_malloc
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 77da9c8..95ff1ec 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -725,7 +725,10 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_SRC_FILES := \ - bionic/malloc_debug_leak.c + bionic/malloc_debug_leak.c \ + bionic/malloc_debug_check.c \ + bionic/malloc_debug_check_mapinfo.c \ + bionic/malloc_debug_stacktrace.c LOCAL_MODULE:= libc_malloc_debug_leak |