chromecast/app/android/cast_jni_loader.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: chromecast/app/android/cast_jni_loader.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:

Index: chromecast/app/android/cast_jni_loader.cc

diff --git a/chromecast/app/android/cast_jni_loader.cc b/chromecast/app/android/cast_jni_loader.cc

index d2cc9c75edc4b87f52adfe540c831ddc107e74f0..886582738d77892d636e5b7b22718fb746bed2ea 100644

--- a/chromecast/app/android/cast_jni_loader.cc

+++ b/chromecast/app/android/cast_jni_loader.cc

@@ -38,7 +38,8 @@ class CastJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate {

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

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

CastJNIOnLoadDelegate delegate;

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

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

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

return -1;

return JNI_VERSION_1_4;

}