OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/android/base_jni_onload.h" | 5 #include "base/android/base_jni_onload.h" |
6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
| 7 #include "base/android/library_loader/library_loader_hooks.h" |
7 #include "base/bind.h" | 8 #include "base/bind.h" |
8 #include "testing/android/native_test/native_test_launcher.h" | 9 #include "testing/android/native_test/native_test_launcher.h" |
9 | 10 |
10 namespace { | 11 namespace { |
11 | 12 |
12 bool RegisterJNI(JNIEnv* env) { | 13 bool RegisterJNI(JNIEnv *env) { |
13 return testing::android::RegisterNativeTestJNI(env); | 14 return testing::android::RegisterNativeTestJNI(env); |
14 } | 15 } |
15 | 16 |
16 bool Init() { | 17 bool NativeInit() { |
| 18 if (!base::android::OnJNIOnLoadInit()) |
| 19 return false; |
17 testing::android::InstallHandlers(); | 20 testing::android::InstallHandlers(); |
18 return true; | 21 return true; |
19 } | 22 } |
20 | 23 |
21 } // namespace | 24 } // namespace |
22 | 25 |
23 | 26 |
24 // This is called by the VM when the shared library is first loaded. | 27 // This is called by the VM when the shared library is first loaded. |
25 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 28 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
26 std::vector<base::android::RegisterCallback> register_callbacks; | 29 base::android::InitVM(vm); |
27 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 30 JNIEnv* env = base::android::AttachCurrentThread(); |
28 | 31 if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || |
29 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks)) | 32 !NativeInit()) { |
30 return -1; | 33 return -1; |
31 | 34 } |
32 std::vector<base::android::InitCallback> init_callbacks; | |
33 init_callbacks.push_back(base::Bind(&Init)); | |
34 if (!base::android::OnJNIOnLoadInit(init_callbacks)) | |
35 return -1; | |
36 | |
37 return JNI_VERSION_1_4; | 35 return JNI_VERSION_1_4; |
38 } | 36 } |
OLD | NEW |