| Index: base/android/java/src/org/chromium/base/library_loader/Linker.java
|
| 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 9a64a3fddbfd3b9837326daa6aaabc9edbdceb22..58f129a5dc934d5871b1073516c703e8f31d233b 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
|
| @@ -15,7 +15,6 @@ import org.chromium.base.SysUtils;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.annotations.AccessedByNative;
|
|
|
| -import java.io.FileNotFoundException;
|
| import java.util.HashMap;
|
| import java.util.Locale;
|
| import java.util.Map;
|
| @@ -806,44 +805,6 @@ public class Linker {
|
| }
|
|
|
| /**
|
| - * Get the full library path in zip file (lib/<abi>/crazy.<lib_name>).
|
| - *
|
| - * @param library The library's base name.
|
| - * @return the library path.
|
| - */
|
| - public static String getLibraryFilePathInZipFile(String library) throws FileNotFoundException {
|
| - synchronized (Linker.class) {
|
| - ensureInitializedLocked();
|
| -
|
| - String path = nativeGetLibraryFilePathInZipFile(library);
|
| - if (path.equals("")) {
|
| - throw new FileNotFoundException(
|
| - "Failed to retrieve path in zip file for library " + library);
|
| - }
|
| - return path;
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * Check whether a library is page aligned and uncompressed in the APK file.
|
| - *
|
| - * @param apkFile Filename of the APK.
|
| - * @param library The library's base name.
|
| - * @return true if page aligned and uncompressed.
|
| - */
|
| - public static boolean checkLibraryIsMappableInApk(String apkFile, String library) {
|
| - synchronized (Linker.class) {
|
| - ensureInitializedLocked();
|
| -
|
| - if (DEBUG) Log.i(TAG, "checkLibraryIsMappableInApk: " + apkFile + ", " + library);
|
| - boolean aligned = nativeCheckLibraryIsMappableInApk(apkFile, library);
|
| - if (DEBUG) Log.i(TAG, library + " is " + (aligned ? "" : "NOT ")
|
| - + "page aligned in " + apkFile);
|
| - return aligned;
|
| - }
|
| - }
|
| -
|
| - /**
|
| * Move activity from the native thread to the main UI thread.
|
| * Called from native code on its own thread. Posts a callback from
|
| * the UI thread back to native code.
|
| @@ -940,25 +901,6 @@ public class Linker {
|
| private static native long nativeGetRandomBaseLoadAddress(long sizeBytes);
|
|
|
| /**
|
| - * Native method used to get the full library path in zip file
|
| - * (lib/<abi>/crazy.<lib_name>).
|
| - *
|
| - * @param library The library's base name.
|
| - * @return the library path (or empty string on failure).
|
| - */
|
| - private static native String nativeGetLibraryFilePathInZipFile(String library);
|
| -
|
| - /**
|
| - * Native method which checks whether a library is page aligned and
|
| - * uncompressed in the APK file.
|
| - *
|
| - * @param apkFile Filename of the APK.
|
| - * @param library The library's base name.
|
| - * @return true if page aligned and uncompressed.
|
| - */
|
| - private static native boolean nativeCheckLibraryIsMappableInApk(String apkFile, String library);
|
| -
|
| - /**
|
| * Record information for a given library.
|
| * IMPORTANT: Native code knows about this class's fields, so
|
| * don't change them without modifying the corresponding C++ sources.
|
|
|