content/public/android/java/src/org/chromium/content/app/ChildProcessService.java - Issue 897683003: Know the process shared library loaded in

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 897683003: Know the process shared library loaded in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix again 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

« no previous file with comments | « components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java ('k') | content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java » ('j') | no next file with comments »
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 20d3b56f04f2e54b9fdbb02e15d8bc3270bb71d7..5c910352a5b0f4637537e888c395de8decc64c59 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

@@ -22,6 +22,7 @@ import org.chromium.base.CommandLine;

import org.chromium.base.JNINamespace;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.library_loader.LibraryLoader;

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

import org.chromium.base.library_loader.Linker;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.browser.ChildProcessConnection;

@@ -165,7 +166,8 @@ public class ChildProcessService extends Service {

boolean loadAtFixedAddressFailed = false;

try {

- LibraryLoader.loadNow(getApplicationContext(), false);

+ LibraryLoader.get(LibraryProcessType.PROCESS_CHILD)

+ .loadNow(getApplicationContext(), false);

isLoaded = true;

} catch (ProcessInitException e) {

if (requestedSharedRelro) {

@@ -179,7 +181,8 @@ public class ChildProcessService extends Service {

if (!isLoaded && requestedSharedRelro) {

Linker.disableSharedRelros();

try {

- LibraryLoader.loadNow(getApplicationContext(), false);

+ LibraryLoader.get(LibraryProcessType.PROCESS_CHILD)

+ .loadNow(getApplicationContext(), false);

isLoaded = true;

} catch (ProcessInitException e) {

Log.e(TAG, "Failed to load native library on retry", e);

@@ -188,10 +191,10 @@ public class ChildProcessService extends Service {

if (!isLoaded) {

System.exit(-1);

}

- LibraryLoader.registerRendererProcessHistogram(

- requestedSharedRelro,

- loadAtFixedAddressFailed);

- LibraryLoader.initialize();

+ LibraryLoader.get(LibraryProcessType.PROCESS_CHILD)

+ .registerRendererProcessHistogram(requestedSharedRelro,

+ loadAtFixedAddressFailed);

+ LibraryLoader.get(LibraryProcessType.PROCESS_CHILD).initialize();

synchronized (mMainThread) {

mLibraryInitialized = true;

mMainThread.notifyAll();