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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/android/jni_android.h"	5 #include "base/android/jni_android.h"

6 #include "base/android/jni_onload_delegate.h"	6 #include "base/android/jni_onload_delegate.h"

7 #include "content/public/app/content_jni_onload.h"	7 #include "content/public/app/content_jni_onload.h"

8 #include "content/public/app/content_main.h"	8 #include "content/public/app/content_main.h"

9 #include "content/public/browser/android/compositor.h"	9 #include "content/public/browser/android/compositor.h"

10 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_test s.h"	10 #include "content/shell/android/linker_test_apk/chromium_linker_test_linker_test s.h"

(...skipping 22 matching lines...) Expand all Loading...
33 content::SetContentMainDelegate(new content::ShellMainDelegate());	33 content::SetContentMainDelegate(new content::ShellMainDelegate());

34 return true;	34 return true;

35 }	35 }

36 };	36 };

37	37

38 } // namespace	38 } // namespace

39	39

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

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

42 ChromiumLinkerTestJNIOnLoadDelegate delegate;	42 ChromiumLinkerTestJNIOnLoadDelegate delegate;

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

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

44 return -1;	45 return -1;

45	46

46 return JNI_VERSION_1_4;	47 return JNI_VERSION_1_4;

47 }	48 }

OLD	NEW