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_registrar.h" | 5 #include "base/android/base_jni_registrar.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 "content/public/app/content_jni_onload.h" | 9 #include "content/public/app/content_jni_onload.h" |
9 #include "content/public/app/content_main.h" | 10 #include "content/public/app/content_main.h" |
10 #include "content/shell/android/shell_jni_registrar.h" | 11 #include "content/shell/android/shell_jni_registrar.h" |
11 #include "content/shell/app/shell_main_delegate.h" | 12 #include "content/shell/app/shell_main_delegate.h" |
12 #include "testing/android/native_test/native_test_launcher.h" | 13 #include "testing/android/native_test/native_test_launcher.h" |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 bool RegisterJNI(JNIEnv* env) { | 17 bool RegisterJNI(JNIEnv *env) { |
17 return base::android::RegisterJni(env) && | 18 return base::android::RegisterJni(env) && |
18 content::android::RegisterShellJni(env) && | 19 content::android::RegisterShellJni(env) && |
19 testing::android::RegisterNativeTestJNI(env); | 20 testing::android::RegisterNativeTestJNI(env); |
20 } | 21 } |
21 | 22 |
22 bool Init() { | 23 bool NativeInit() { |
| 24 if (!content::android::OnJNIOnLoadInit()) |
| 25 return false; |
23 content::SetContentMainDelegate(new content::ShellMainDelegate()); | 26 content::SetContentMainDelegate(new content::ShellMainDelegate()); |
24 return true; | 27 return true; |
25 } | 28 } |
26 | 29 |
27 } // namespace | 30 } // namespace |
28 | 31 |
29 | 32 |
30 // This is called by the VM when the shared library is first loaded. | 33 // This is called by the VM when the shared library is first loaded. |
31 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 34 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
32 std::vector<base::android::RegisterCallback> register_callbacks; | 35 base::android::InitVM(vm); |
33 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 36 JNIEnv* env = base::android::AttachCurrentThread(); |
34 std::vector<base::android::InitCallback> init_callbacks; | 37 if (!content::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || |
35 init_callbacks.push_back(base::Bind(&Init)); | 38 !NativeInit()) { |
36 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | |
37 !content::android::OnJNIOnLoadInit(init_callbacks)) { | |
38 return -1; | 39 return -1; |
39 } | 40 } |
40 return JNI_VERSION_1_4; | 41 return JNI_VERSION_1_4; |
41 } | 42 } |
OLD | NEW |