Index: chrome/browser/android/monochrome_entry_point.cc |
diff --git a/chrome/browser/android/monochrome_entry_point.cc b/chrome/browser/android/monochrome_entry_point.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..7b3d0702cf1df60a8d8013faf8532239c065453b |
--- /dev/null |
+++ b/chrome/browser/android/monochrome_entry_point.cc |
@@ -0,0 +1,39 @@ |
+// Copyright 2015 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "android_webview/lib/main/webview_jni_onload.h" |
+#include "base/android/jni_android.h" |
+#include "base/android/library_loader/library_loader_hooks.h" |
+#include "base/bind.h" |
+#include "chrome/app/android/chrome_jni_onload.h" |
+ |
+namespace { |
+ |
+bool RegisterJNI(JNIEnv* env) { |
+ return true; |
+} |
+ |
+bool Init() { |
+ return true; |
+} |
+ |
+} // 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
|
+ |
+// This is called by the VM when the shared library is first loaded. |
+JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
+ base::android::InitVM(vm); |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ bool ret; |
+ int library_process_type = base::android::GetLibraryProcessType(env); |
+ if (library_process_type == base::android::PROCESS_WEBVIEW || |
+ library_process_type == base::android::PROCESS_WEBVIEW_CHILD) { |
+ base::android::DisableManualJniRegistration(); |
+ ret = android_webview::OnJNIOnLoadInit(); |
+ } else { |
+ ret = chrome::android::OnJNIOnLoadRegisterJNI(vm, |
+ base::Bind(&RegisterJNI)) && |
+ chrome::android::OnJNIOnLoadInit(base::Bind(&Init)); |
+ } |
+ return ret ? JNI_VERSION_1_4 : -1; |
+} |