content/public/android/java/src/org/chromium/content/app/ChildProcessService.java - Issue 1224963002: Refactor chromium's Linker class.

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 1224963002: Refactor chromium's Linker class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update for review feedback. Created 5 years, 5 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/java/src/org/chromium/base/library_loader/LegacyLinker.java ('K') | « base/base.gyp ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.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 1e3345bcb9696fe44bd0263d087065cf5ce7fa25..a02e64089a597bf3da909cb773c069a7d777ae9b 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

@@ -96,7 +96,7 @@ public class ChildProcessService extends Service {

System.arraycopy(fdInfosAsParcelable, 0, mFdInfos, 0, fdInfosAsParcelable.length);

Bundle sharedRelros = args.getBundle(Linker.EXTRA_LINKER_SHARED_RELROS);

if (sharedRelros != null) {

- Linker.useSharedRelros(sharedRelros);

+ Linker.getInstance().useSharedRelros(sharedRelros);

sharedRelros = null;

}

mMainThread.notifyAll();

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

}

CommandLine.init(mCommandLineParams);

- boolean useLinker = Linker.isUsed();

+ Linker linker = Linker.getInstance();

+ boolean useLinker = linker.isUsed();

boolean requestedSharedRelro = false;

if (useLinker) {

synchronized (mMainThread) {

@@ -147,11 +148,11 @@ public class ChildProcessService extends Service {

assert mLinkerParams != null;

if (mLinkerParams.mWaitForSharedRelro) {

requestedSharedRelro = true;

- Linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);

+ linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);

} else {

- Linker.disableSharedRelros();

+ linker.disableSharedRelros();

}

- Linker.setTestRunnerClassName(mLinkerParams.mTestRunnerClassName);

+ linker.setTestRunnerClassName(mLinkerParams.mTestRunnerClassName);

}

boolean isLoaded = false;

if (CommandLine.getInstance().hasSwitch(

@@ -174,7 +175,7 @@ public class ChildProcessService extends Service {

}

if (!isLoaded && requestedSharedRelro) {

- Linker.disableSharedRelros();

+ linker.disableSharedRelros();

try {

LibraryLoader.get(LibraryProcessType.PROCESS_CHILD)

.loadNow(getApplicationContext());