| Index: base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| index 9c16204ccc580cfdbbc6eb3fbb229c1964c47172..d3e0fb96b9cce43a28f7e5cfb0b896b755650b18 100644
|
| --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| @@ -298,8 +298,13 @@ public class LibraryLoader {
|
| Log.i(TAG, "Loading " + library);
|
| }
|
|
|
| - // Load the library using this Linker. May throw UnsatisfiedLinkError.
|
| - loadLibrary(linker, zipFilePath, libFilePath);
|
| + try {
|
| + // Load the library using this Linker. May throw UnsatisfiedLinkError.
|
| + loadLibrary(linker, zipFilePath, libFilePath);
|
| + } catch (UnsatisfiedLinkError e) {
|
| + Log.e(TAG, "Unable to load library: " + library);
|
| + throw(e);
|
| + }
|
| }
|
|
|
| linker.finishLibraryLoad();
|
| @@ -309,7 +314,12 @@ public class LibraryLoader {
|
| }
|
| // Load libraries using the system linker.
|
| for (String library : NativeLibraries.LIBRARIES) {
|
| - System.loadLibrary(library);
|
| + try {
|
| + System.loadLibrary(library);
|
| + } catch (UnsatisfiedLinkError e) {
|
| + Log.e(TAG, "Unable to load library: " + library);
|
| + throw(e);
|
| + }
|
| }
|
| }
|
|
|
|
|