Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

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

Issue 930333003: Fix Linker.sInBrowserProcess to avoid false negatives (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 side-by-side diff with in-line comments
Download patch
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 5c910352a5b0f4637537e888c395de8decc64c59..ece2ff155e924e8c3b989f28f359fe2ba2eecef7 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
@@ -150,9 +150,10 @@ public class ChildProcessService extends Service {
}
}
assert mLinkerParams != null;
+ Linker.initServiceProcess();
if (mLinkerParams.mWaitForSharedRelro) {
requestedSharedRelro = true;
- Linker.initServiceProcess(mLinkerParams.mBaseLoadAddress);
+ Linker.enableSharedRelros(mLinkerParams.mBaseLoadAddress);
} else {
Linker.disableSharedRelros();
}

Powered by Google App Engine
This is Rietveld 408576698