Merge branch 'cm-12.1' of https://github.com/CyanogenMod/android_bionic…

… into cm-12.1
NitroCM · Oct 19, 2015 · f052f2e · f052f2e
2 parents af6643b + 852eb1a
commit f052f2e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/libc/bionic/malloc_debug_common.cpp b/libc/bionic/malloc_debug_common.cpp
@@ -387,6 +387,9 @@ static void malloc_init_impl() {
     case 10:
       so_name = "libc_malloc_debug_leak.so";
       break;
+    case 15:
+      so_name = "libefence.so";
+      break;
     case 20:
       // Quick check: debug level 20 can only be handled in emulator.
       if (!qemu_running) {
@@ -473,6 +476,9 @@ static void malloc_init_impl() {
     case 10:
       InitMalloc(malloc_impl_handle, &malloc_dispatch_table, "chk");
       break;
+    case 15:
+      InitMalloc(malloc_impl_handle, &malloc_dispatch_table, "efence");
+      break;
     case 20:
       InitMalloc(malloc_impl_handle, &malloc_dispatch_table, "qemu_instrumented");
       break;