content/shell/android/linker_test_apk/content_linker_test_android.cc - Issue 141223002: Move the android library loader from content to base

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/content_linker_test_android.cc

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 11 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

« content/shell/android/browsertests_apk/content_browser_tests_android.cc ('K') | « content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 42c01d0e9407bcb1b7c47f558459af1ed070f02f..476fdb948d61e7744a7e0b90132161828b2df982 100644

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

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

@@ -4,6 +4,7 @@

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

+#include "base/android/library_loader/library_loader_hooks.h"

#include "base/basictypes.h"

#include "base/debug/debugger.h"

#include "base/logging.h"

@@ -16,6 +17,9 @@

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

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

+ startup::SetLibraryLoadedHook(&content::LibraryLoaded);

Yaron 2014/01/17 02:18:25 base::android?

aberent 2014/01/30 17:46:05 Done.

base::android::InitVM(vm);

JNIEnv* env = base::android::AttachCurrentThread();