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

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

Issue 611393002: Rationalize and fix chromium android linker histogram recording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move renderer UMA update call. Created 6 years, 2 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 | « base/android/library_loader/library_loader_hooks.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 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;
« no previous file with comments | « base/android/library_loader/library_loader_hooks.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698