OLD | NEW |
---|---|
(Empty) | |
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 | |
3 // found in the LICENSE file. | |
4 | |
5 #include "android_webview/lib/main/webview_jni_onload.h" | |
6 #include "base/android/jni_android.h" | |
7 #include "base/android/library_loader/library_loader_hooks.h" | |
8 #include "base/bind.h" | |
9 #include "chrome/app/android/chrome_jni_onload.h" | |
10 | |
11 namespace { | |
12 | |
13 bool RegisterJNI(JNIEnv* env) { | |
14 return true; | |
15 } | |
16 | |
17 bool Init() { | |
18 return true; | |
19 } | |
20 | |
21 } // namespace | |
michaelbai
2016/05/03 19:30:17
We don't need above two methods, right?, there is
Yaron
2016/05/03 20:14:48
the chrome case does need them - note the callback
michaelbai
2016/05/03 20:54:01
I see, you changed it to call the chrome one, but
Yaron
2016/05/04 13:07:44
Ya, understood but I removed the clank ones. We co
| |
22 | |
23 // This is called by the VM when the shared library is first loaded. | |
24 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | |
25 base::android::InitVM(vm); | |
26 JNIEnv* env = base::android::AttachCurrentThread(); | |
27 bool ret; | |
28 int library_process_type = base::android::GetLibraryProcessType(env); | |
29 if (library_process_type == base::android::PROCESS_WEBVIEW || | |
30 library_process_type == base::android::PROCESS_WEBVIEW_CHILD) { | |
31 base::android::DisableManualJniRegistration(); | |
32 ret = android_webview::OnJNIOnLoadInit(); | |
33 } else { | |
34 ret = chrome::android::OnJNIOnLoadRegisterJNI(vm, | |
35 base::Bind(&RegisterJNI)) && | |
36 chrome::android::OnJNIOnLoadInit(base::Bind(&Init)); | |
37 } | |
38 return ret ? JNI_VERSION_1_4 : -1; | |
39 } | |
OLD | NEW |