am e05816cf: Merge "Fix debug malloc for LP64."

* commit 'e05816cfa0270d7def33da70bf2ada12350b08b5':
  Fix debug malloc for LP64.
This commit is contained in:
Elliott Hughes 2014-04-01 21:09:54 +00:00 committed by Android Git Automerger
commit abd89b0ccc

View File

@ -379,7 +379,7 @@ static void malloc_init_impl() {
if (gMallocDebugBacklog == 0) {
gMallocDebugBacklog = BACKLOG_DEFAULT_LEN;
}
so_name = "/system/lib/libc_malloc_debug_leak.so";
so_name = "libc_malloc_debug_leak.so";
break;
}
case 20:
@ -395,7 +395,7 @@ static void malloc_init_impl() {
__progname);
return;
}
so_name = "/system/lib/libc_malloc_debug_qemu.so";
so_name = "libc_malloc_debug_qemu.so";
break;
default:
error_log("%s: Debug level %d is unknown\n", __progname, gMallocDebugLevel);