content/public/android/java/src/org/chromium/content/app/ChildProcessService.java - 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/public/android/java/src/org/chromium/content/app/ChildProcessService.java

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

« base/android/library_loader/library_loader_hooks.cc ('K') | « content/content_jni.gypi ('k') | content/public/android/java/src/org/chromium/content/app/ContentApplication.java » ('j') | content/public/app/android_library_loader_hooks.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

index 2898d423444fad86298329a9fdf2780367cb0972..1370baa33ab6766c47ef80cfad49009682a7f856 100644

--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

@@ -18,11 +18,14 @@ import android.view.Surface;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

+import org.chromium.base.library_loader.LibraryLoader;

+import org.chromium.base.library_loader.Linker;

+import org.chromium.base.library_loader.LinkerParams;

+import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.browser.ChildProcessConnection;

import org.chromium.content.browser.ChildProcessLauncher;

import org.chromium.content.common.IChildProcessCallback;

import org.chromium.content.common.IChildProcessService;

-import org.chromium.content.common.ProcessInitException;

import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicReference;

@@ -196,6 +199,7 @@ public class ChildProcessService extends Service {

mMainThread.wait();

}

} catch (InterruptedException e) {

+ // Ignore

}

// Try to shutdown the MainThread gracefully, but it might not