content/shell/android/linker_test_apk/chromium_linker_test_android.cc - Issue 935413004: Separate OnJNIOnLoad

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/linker_test_apk/chromium_linker_test_android.cc

Issue 935413004: Separate OnJNIOnLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« base/android/base_jni_onload.h ('K') | « content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc ('k') | content/shell/android/shell_library_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/linker_test_apk/chromium_linker_test_android.cc

diff --git a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc

index 6e8ef567e98c644416f235d22613e8c800c91688..1357bb78c894ce4c41adbf7d6d036d0a187ff79e 100644

--- a/content/shell/android/linker_test_apk/chromium_linker_test_android.cc

+++ b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc

@@ -40,7 +40,8 @@ class ChromiumLinkerTestJNIOnLoadDelegate :

// This is called by the VM when the shared library is first loaded.

JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {

ChromiumLinkerTestJNIOnLoadDelegate delegate;

- if (!content::android::OnJNIOnLoad(vm, &delegate))

+ if (!content::android::OnJNIOnLoadRegisterJNI(vm, &delegate) &&

+ !content::android::OnJNIOnLoadInit(&delegate))

return -1;

return JNI_VERSION_1_4;