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/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/android/library_loader/library_loader_hooks.h" |
8 #include "components/devtools_bridge/android/session_dependency_factory_android.
h" | 8 #include "components/devtools_bridge/android/session_dependency_factory_android.
h" |
9 | 9 |
10 using namespace devtools_bridge::android; | 10 using namespace devtools_bridge::android; |
11 | 11 |
12 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 12 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
13 base::android::InitVM(vm); | 13 base::android::InitVM(vm); |
14 JNIEnv* env = base::android::AttachCurrentThread(); | 14 JNIEnv* env = base::android::AttachCurrentThread(); |
15 if (!base::android::RegisterLibraryLoaderEntryHook(env)) { | 15 if (!base::android::RegisterLibraryLoaderEntryHook(env) || |
| 16 !base::android::RegisterJni(env) || |
| 17 !SessionDependencyFactoryAndroid::InitializeSSL() || |
| 18 !SessionDependencyFactoryAndroid::RegisterNatives(env)) { |
16 return -1; | 19 return -1; |
17 } | 20 } |
18 if (!base::android::RegisterJni(env)) { | |
19 return -1; | |
20 } | |
21 if (!SessionDependencyFactoryAndroid::InitializeSSL()) { | |
22 return -1; | |
23 } | |
24 SessionDependencyFactoryAndroid::RegisterNatives(env); | |
25 return JNI_VERSION_1_4; | 21 return JNI_VERSION_1_4; |
26 } | 22 } |
OLD | NEW |