| 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 cd5e675721c825b4cae382a39b2360d4509b1a43..0edecbd2253b5caf12ae99b4ccf6e5ad039f47f4 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
|
| @@ -160,6 +160,7 @@ public class ChildProcessService extends Service {
|
| android.os.Debug.waitForDebugger();
|
| }
|
|
|
| + boolean loadAtFixedAddressFailed = false;
|
| try {
|
| LibraryLoader.loadNow(getApplicationContext(), false);
|
| isLoaded = true;
|
| @@ -167,6 +168,7 @@ public class ChildProcessService extends Service {
|
| if (requestedSharedRelro) {
|
| Log.w(TAG, "Failed to load native library with shared RELRO, " +
|
| "retrying without");
|
| + loadAtFixedAddressFailed = true;
|
| } else {
|
| Log.e(TAG, "Failed to load native library", e);
|
| }
|
| @@ -183,6 +185,9 @@ public class ChildProcessService extends Service {
|
| if (!isLoaded) {
|
| System.exit(-1);
|
| }
|
| + LibraryLoader.registerRendererProcessHistogram(
|
| + requestedSharedRelro,
|
| + loadAtFixedAddressFailed);
|
| LibraryLoader.initialize();
|
| synchronized (mMainThread) {
|
| mLibraryInitialized = true;
|
|
|