Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Side by Side Diff: android_webview/lib/main/webview_entry_point.cc

Issue 920883002: Use combined native/manual JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Factor out common code in test Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/lib/main/webview_jni_onload_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "android_webview/lib/main/webview_jni_onload_delegate.h" 5 #include "android_webview/lib/main/webview_jni_onload_delegate.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "content/public/app/content_jni_onload.h" 7 #include "content/public/app/content_jni_onload.h"
8 8
9 // This is called by the VM when the shared library is first loaded. 9 // This is called by the VM when the shared library is first loaded.
10 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. 10 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here.
11 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 11 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
12 // WebView uses native JNI exports; disable manual JNI registration to
13 // improve startup peformance.
14 base::android::DisableManualJniRegistration();
15
12 if (!android_webview::OnJNIOnLoad(vm)) 16 if (!android_webview::OnJNIOnLoad(vm))
13 return -1; 17 return -1;
14 18
15 return JNI_VERSION_1_4; 19 return JNI_VERSION_1_4;
16 } 20 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/lib/main/webview_jni_onload_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698