resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp
Change-Id: I58b9c13d20771aa39b703ec05cbff8aeaad38fe8
This commit is contained in:
@@ -731,7 +731,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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user