Index: testing/android/native_test/native_test_jni_onload.cc |
diff --git a/testing/android/native_test/native_test_jni_onload.cc b/testing/android/native_test/native_test_jni_onload.cc |
index 8fecc444c0ecd306abadfbc323ba02c80aea3269..01c3aba94b174ca430be29d6503c25ba6d7a4ddf 100644 |
--- a/testing/android/native_test/native_test_jni_onload.cc |
+++ b/testing/android/native_test/native_test_jni_onload.cc |
@@ -4,16 +4,19 @@ |
#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 "testing/android/native_test/native_test_launcher.h" |
namespace { |
-bool RegisterJNI(JNIEnv* env) { |
+bool RegisterJNI(JNIEnv *env) { |
return testing::android::RegisterNativeTestJNI(env); |
} |
-bool Init() { |
+bool NativeInit() { |
+ if (!base::android::OnJNIOnLoadInit()) |
+ return false; |
testing::android::InstallHandlers(); |
return true; |
} |
@@ -23,16 +26,11 @@ bool Init() { |
// This is called by the VM when the shared library is first loaded. |
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
- std::vector<base::android::RegisterCallback> register_callbacks; |
- register_callbacks.push_back(base::Bind(&RegisterJNI)); |
- |
- if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks)) |
- return -1; |
- |
- std::vector<base::android::InitCallback> init_callbacks; |
- init_callbacks.push_back(base::Bind(&Init)); |
- if (!base::android::OnJNIOnLoadInit(init_callbacks)) |
+ base::android::InitVM(vm); |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || |
+ !NativeInit()) { |
return -1; |
- |
+ } |
return JNI_VERSION_1_4; |
} |