| Index: android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| diff --git a/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| index e5813009198ffcfaf918789424a6b99f3595ed1b..4fa802064e48b4f778a5e5bc7fa55f4685fb1cd6 100644
|
| --- a/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| +++ b/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| @@ -219,13 +219,10 @@ public class LibraryLoader {
|
| assert !mInitialized;
|
|
|
| long startTime = SystemClock.uptimeMillis();
|
| - Linker linker = Linker.getInstance();
|
| - boolean useChromiumLinker = linker.isUsed();
|
|
|
| - if (useChromiumLinker) {
|
| - // Determine the APK file path.
|
| - String apkFilePath = getLibraryApkPath(context);
|
| + if (Linker.isUsed()) {
|
| // Load libraries using the Chromium linker.
|
| + Linker linker = Linker.getInstance();
|
| linker.prepareLibraryLoad();
|
|
|
| for (String library : NativeLibraries.LIBRARIES) {
|
| @@ -242,8 +239,8 @@ public class LibraryLoader {
|
| String libFilePath = System.mapLibraryName(library);
|
| if (linker.isInZipFile()) {
|
| // Load directly from the APK.
|
| - zipFilePath = apkFilePath;
|
| - Log.i(TAG, "Loading " + library + " from within " + apkFilePath);
|
| + zipFilePath = getLibraryApkPath(context);
|
| + Log.i(TAG, "Loading " + library + " from within " + zipFilePath);
|
| } else {
|
| // The library is in its own file.
|
| Log.i(TAG, "Loading " + library);
|
|
|