From 1058da0068ab500229a385fe30e67a635c94c4ea Mon Sep 17 00:00:00 2001 From: simonb Date: Tue, 28 Oct 2014 10:20:26 -0700 Subject: [PATCH] Clarify failure to load the crazy linker library. On failure to load libchromium_android_linker.so, we retry with libchromium_android_linker.cr.so. If the latter fails then only the name 'libchromium_android_linker.cr.so' appears in the logcat. This is confusing where (commonly) this is not a components build. Add a warning to clarify that libchromium_android_linker.cr.so is a load retry with a different name. BUG= Review URL: https://codereview.chromium.org/683163003 Cr-Commit-Position: refs/heads/master@{#301654} --- base/android/java/src/org/chromium/base/library_loader/Linker.java | 1 + 1 file changed, 1 insertion(+) diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java index 8ad26d8a8391..997b67c4b024 100644 --- a/base/android/java/src/org/chromium/base/library_loader/Linker.java +++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java @@ -232,6 +232,7 @@ public class Linker { System.loadLibrary(TAG); } catch (UnsatisfiedLinkError e) { // In a component build, the ".cr" suffix is added to each library name. + Log.w(TAG, "Couldn't load lib" + TAG + ".so, trying lib" + TAG + ".cr.so"); System.loadLibrary(TAG + ".cr"); } sRelroSharingSupported = nativeCanUseSharedRelro(); -- 2.11.4.GIT