| 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 484c6bc56d55596cdf77610e3cbf8e541c4d3d67..7dc015dc8f9ecb7c420e55046b2351646fb9fd2f 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
|
| @@ -14,6 +14,7 @@ import org.chromium.base.CalledByNative;
|
| import org.chromium.base.CommandLine;
|
| import org.chromium.base.JNINamespace;
|
| import org.chromium.base.TraceEvent;
|
| +import org.chromium.base.VisibleForTesting;
|
|
|
| import java.io.File;
|
| import java.io.FileNotFoundException;
|
| @@ -127,6 +128,7 @@ public class LibraryLoader {
|
| *
|
| * @throws ProcessInitException
|
| */
|
| + @VisibleForTesting
|
| public void ensureInitialized() throws ProcessInitException {
|
| ensureInitialized(null, false);
|
| }
|
| @@ -353,9 +355,14 @@ public class LibraryLoader {
|
| } else {
|
| // The library is in its own file.
|
| Log.i(TAG, "Loading " + library);
|
| - ApplicationInfo applicationInfo = context.getApplicationInfo();
|
| - mLoadedFrom.put(library, new File(applicationInfo.nativeLibraryDir,
|
| - libFilePath).getAbsolutePath());
|
| + if (context != null) {
|
| + ApplicationInfo applicationInfo = context.getApplicationInfo();
|
| + File file = new File(applicationInfo.nativeLibraryDir, libFilePath);
|
| + mLoadedFrom.put(library, file.getAbsolutePath());
|
| + } else {
|
| + Log.i(TAG, "No context, cannot locate the native library file for "
|
| + + library);
|
| + }
|
| }
|
|
|
| // Load the library.
|
|
|