Hook-up OnJNIOnLoadRegisterJNI for JNI registration in mojo network service.

mojo/services/network/android_hooks.cc

Index: mojo/services/network/android_hooks.cc
diff --git a/mojo/services/network/android_hooks.cc b/mojo/services/network/android_hooks.cc
index 190eef178580a843dbef16090d39109bdb7c5dcb..e8224023bca84f0710c4e5c2889df288ab0d8857 100644
--- a/mojo/services/network/android_hooks.cc
+++ b/mojo/services/network/android_hooks.cc
@@ -2,19 +2,41 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/android/base_jni_registrar.h"
+#include <vector>
+
+#include "base/android/base_jni_onload.h"
 #include "base/android/jni_android.h"
+#include "base/android/library_loader/library_loader_hooks.h"
+#include "base/bind.h"
 #include "net/android/net_jni_registrar.h"
 
+namespace {
+bool RegisterJNI(JNIEnv* env) {
+  return net::android::RegisterJni(env);
+}
+
+bool Init() {
+  return true;
+}
+}  // namespace
+
+
+// This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
 
-  if (!base::android::RegisterJni(env))
-    return -1;
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
 
-  if (!net::android::RegisterJni(env))
+  if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !base::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
+  }
+
+  // There cannot be two AtExitManagers at the same time. Remove the one from
+  // LibraryLoader as ApplicationRunnerChromium also uses one.
+  base::android::LibraryLoaderExitHook();

[michaelbai, 2015/03/04 17:25:52]

Why can't you use the AtExitManager created in base? If you have to do this, it
should be in Init().

[qsr, 2015/03/04 17:28:59]

We use the one in base, but we create it later on as part of the normal flow for
all mojo application.

 
   return JNI_VERSION_1_4;
 }