OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/jni_android.h" | 5 #include "base/android/jni_android.h" |
| 6 #include "base/android/library_loader/library_loader_hooks.h" |
6 #include "base/bind.h" | 7 #include "base/bind.h" |
7 #include "content/public/app/content_jni_onload.h" | 8 #include "content/public/app/content_jni_onload.h" |
8 #include "content/public/app/content_main.h" | 9 #include "content/public/app/content_main.h" |
9 #include "content/public/browser/android/compositor.h" | 10 #include "content/public/browser/android/compositor.h" |
10 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_test
s.h" | 11 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_test
s.h" |
11 #include "content/shell/android/shell_jni_registrar.h" | 12 #include "content/shell/android/shell_jni_registrar.h" |
12 #include "content/shell/app/shell_main_delegate.h" | 13 #include "content/shell/app/shell_main_delegate.h" |
13 | 14 |
14 namespace { | 15 namespace { |
15 | 16 |
16 bool RegisterJNI(JNIEnv* env) { | 17 bool RegisterJNI(JNIEnv* env) { |
17 // To be called only from the UI thread. If loading the library is done on | 18 // To be called only from the UI thread. If loading the library is done on |
18 // a separate thread, this should be moved elsewhere. | 19 // a separate thread, this should be moved elsewhere. |
19 if (!content::android::RegisterShellJni(env)) | 20 if (!content::android::RegisterShellJni(env)) |
20 return false; | 21 return false; |
21 | 22 |
22 if (!content::RegisterLinkerTestsJni(env)) | 23 if (!content::RegisterLinkerTestsJni(env)) |
23 return false; | 24 return false; |
24 | 25 |
25 return true; | 26 return true; |
26 } | 27 } |
27 | 28 |
28 bool Init() { | 29 bool NativeInit() { |
| 30 if (!content::android::OnJNIOnLoadInit()) |
| 31 return false; |
29 content::Compositor::Initialize(); | 32 content::Compositor::Initialize(); |
30 content::SetContentMainDelegate(new content::ShellMainDelegate()); | 33 content::SetContentMainDelegate(new content::ShellMainDelegate()); |
31 return true; | 34 return true; |
32 } | 35 } |
33 | 36 |
34 } // namespace | 37 } // namespace |
35 | 38 |
36 // This is called by the VM when the shared library is first loaded. | 39 // This is called by the VM when the shared library is first loaded. |
37 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 40 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
38 std::vector<base::android::RegisterCallback> register_callbacks; | 41 base::android::InitVM(vm); |
39 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 42 JNIEnv* env = base::android::AttachCurrentThread(); |
40 std::vector<base::android::InitCallback> init_callbacks; | 43 if (!content::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) || |
41 init_callbacks.push_back(base::Bind(&Init)); | 44 !NativeInit()) { |
42 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | |
43 !content::android::OnJNIOnLoadInit(init_callbacks)) { | |
44 return -1; | 45 return -1; |
45 } | 46 } |
46 return JNI_VERSION_1_4; | 47 return JNI_VERSION_1_4; |
47 } | 48 } |
OLD | NEW |