am 19a54ce4: am 88a8e09b: am 5e6e3edb: Merge "Export get_malloc_leak_info and free_malloc_leak_info, used by ddms."

* commit '19a54ce4d446cdea01a7d50c2951481f3ed006bd':
  Export get_malloc_leak_info and free_malloc_leak_info, used by ddms.
This commit is contained in:
Elliott Hughes 2014-05-16 23:40:25 +00:00 committed by Android Git Automerger
commit 0f43d02843

View File

@ -113,7 +113,9 @@ static int hash_entry_compare(const void* arg1, const void* arg2) {
* not include heap overhead
* "*backtraceSize" is set to the maximum number of entries in the back trace
*/
extern "C" __LIBC_HIDDEN__ void get_malloc_leak_info(uint8_t** info, size_t* overallSize,
// Exported for use by ddms.
extern "C" void get_malloc_leak_info(uint8_t** info, size_t* overallSize,
size_t* infoSize, size_t* totalMemory, size_t* backtraceSize) {
// don't do anything if we have invalid arguments
if (info == NULL || overallSize == NULL || infoSize == NULL ||
@ -182,7 +184,8 @@ extern "C" __LIBC_HIDDEN__ void get_malloc_leak_info(uint8_t** info, size_t* ove
dlfree(list);
}
extern "C" __LIBC_HIDDEN__ void free_malloc_leak_info(uint8_t* info) {
// Exported for use by ddms.
extern "C" void free_malloc_leak_info(uint8_t* info) {
dlfree(info);
}