commit b1b8bfb8fd3c461181fdb348573b57f3b7f3ed62
author Christopher Ferris <cferris@google.com> Thu Mar 28 15:08:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 15:08:14 2019 -0700
tree 6db4ace042a72e561909966f7d6da6c1d5339a01
parent 04b01781665c122cdd07177dd89063576c9e4c8a
parent 6c5c6afea9c47d85ecada0f1d6d799ab640febf4

Merge "Fix double initialization call."
am: 6c5c6afea9

Change-Id: I8f1fa90413b1b09e8048a13c3790cd87f6ad697d

libc/bionic/malloc_common_dynamic.cpp

diff --git a/libc/bionic/malloc_common_dynamic.cpp b/libc/bionic/malloc_common_dynamic.cpp
index 40f497e..e12c247 100644
--- a/libc/bionic/malloc_common_dynamic.cpp
+++ b/libc/bionic/malloc_common_dynamic.cpp
@@ -328,13 +328,6 @@
     return false;
   }
 
-  init_func_t init_func = reinterpret_cast<init_func_t>(gFunctions[FUNC_INITIALIZE]);
-  if (!init_func(&__libc_malloc_default_dispatch, &gMallocLeakZygoteChild, options)) {
-    error_log("%s: failed to enable malloc %s", getprogname(), prefix);
-    ClearGlobalFunctions();
-    return false;
-  }
-
   if (!FinishInstallHooks(globals, options, prefix)) {
     dlclose(impl_handle);
     return false;