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

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 webview compile error Created 5 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
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..b454d43c9a35f68fc1777d588497fe8666ba6868 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
@@ -165,7 +165,8 @@ public class ChildProcessService extends Service {
boolean loadAtFixedAddressFailed = false;
try {
- LibraryLoader.loadNow(getApplicationContext(), false);
+ LibraryLoader.get(LibraryLoader.CHILD)
+ .loadNow(getApplicationContext(), false);
Ted C 2015/02/06 01:37:43 should be indented 8, same below.
michaelbai 2015/02/10 05:17:31 Done.
isLoaded = true;
} catch (ProcessInitException e) {
if (requestedSharedRelro) {
@@ -179,7 +180,8 @@ public class ChildProcessService extends Service {
if (!isLoaded && requestedSharedRelro) {
Linker.disableSharedRelros();
try {
- LibraryLoader.loadNow(getApplicationContext(), false);
+ LibraryLoader.get(LibraryLoader.CHILD)
+ .loadNow(getApplicationContext(), false);
isLoaded = true;
} catch (ProcessInitException e) {
Log.e(TAG, "Failed to load native library on retry", e);
@@ -188,10 +190,10 @@ public class ChildProcessService extends Service {
if (!isLoaded) {
System.exit(-1);
}
- LibraryLoader.registerRendererProcessHistogram(
+ LibraryLoader.get(LibraryLoader.CHILD).registerRendererProcessHistogram(
requestedSharedRelro,
loadAtFixedAddressFailed);
- LibraryLoader.initialize();
+ LibraryLoader.get(LibraryLoader.CHILD).initialize();
synchronized (mMainThread) {
mLibraryInitialized = true;
mMainThread.notifyAll();

Powered by Google App Engine
This is Rietveld 408576698