commit 041169f7ca703d560a819e7a568170731d4ecdd6
author Dimitry Ivanov <dimitry@google.com> Thu Apr 21 16:01:24 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Mon Apr 25 11:01:49 2016 -0700
tree 9184a7a5f74779787c897093428a58e4f1d19239
parent 2712a078c74050f787900765830f7f33d8bd75e6

Initialize native loader on JNI_CreateJavaVM

We need to initialize native loader in order to
be able to use JNI from any VM, be it dalvikvm
or VM started by zygote.

Bug: http://b/28082914
Bug: http://b/28320913
Change-Id: Ice9a33a736d7c6ec3af9a5a0fb25a378ad9d2c59

runtime/java_vm_ext.cc

diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc
index a41fd45..35bb3c3 100644
--- a/runtime/java_vm_ext.cc
+++ b/runtime/java_vm_ext.cc
@@ -950,6 +950,11 @@
     LOG(WARNING) << "CreateJavaVM failed";
     return JNI_ERR;
   }
+
+  // Initialize native loader. This step makes sure we have
+  // everything set up before we start using JNI.
+  android::InitializeNativeLoader();
+
   *p_env = Thread::Current()->GetJniEnv();
   *p_vm = runtime->GetJavaVM();
   return JNI_OK;