- * Note: This is a synchronous operation + * Note: This is a synchronous operation */ public void loadLibrary(final Context context, final String library) { loadLibrary(context, library, null, null); } + /** + * Utilizes the regular system call to attempt to load a native library. If a failure occurs, + * then the function tries to load dependencies and then attempts to load it again. + *
+ * Note: This is a synchronous operation
+ */
+ public void load(final Context context, final File library) {
+ load(context, library, null);
+ }
+
/**
* The same call as {@link #loadLibrary(Context, String)}, however if a {@code version} is
* provided, then that specific version of the given library is loaded.
@@ -111,12 +121,12 @@ public void loadLibrary(final Context context,
}
/**
- * Attemps to load the given library normally. If that fails, it loads the library utilizing
+ * Attempts to load the given library normally. If that fails, it loads the library utilizing
* a workaround.
*
- * @param context The {@link Context} to get a workaround directory from
- * @param library The library you wish to load
- * @param version The version of the library you wish to load, or {@code null}
+ * @param context The {@link Context} to get a workaround directory from
+ * @param library The library you wish to load
+ * @param version The version of the library you wish to load, or {@code null}
* @param listener {@link ReLinker.LoadListener} to listen for async execution, or {@code null}
*/
public void loadLibrary(final Context context,
@@ -151,6 +161,45 @@ public void run() {
}
}
+ /**
+ * Attempts to load the given library normally. If that fails, it loads the library utilizing
+ * a workaround.
+ *
+ * @param context The {@link Context} to get a workaround directory from
+ * @param library The library file you wish to load
+ * @param listener {@link ReLinker.LoadListener} to listen for async execution, or {@code null}
+ */
+ public void load(final Context context,
+ final File library,
+ final ReLinker.LoadListener listener) {
+ if (context == null) {
+ throw new IllegalArgumentException("Given context is null");
+ }
+
+ if (!library.exists()) {
+ throw new IllegalArgumentException("Given library file does not exists");
+ }
+
+ log("Beginning load of %s...", library);
+ if (listener == null) {
+ loadInternal(context, library);
+ } else {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ loadInternal(context, library);
+ listener.success();
+ } catch (UnsatisfiedLinkError e) {
+ listener.failure(e);
+ } catch (MissingLibraryException e) {
+ listener.failure(e);
+ }
+ }
+ }).start();
+ }
+ }
+
private void loadLibraryInternal(final Context context,
final String library,
final String version) {
@@ -181,29 +230,63 @@ private void loadLibraryInternal(final Context context,
libraryLoader.mapLibraryName(library), workaroundFile, this);
}
+ if (recursive) {
+ loadDependencies(context, workaroundFile);
+ }
+
+ libraryLoader.loadPath(workaroundFile.getAbsolutePath());
+ loadedLibraries.add(library);
+ log("%s (%s) was re-linked!", library, version);
+ }
+
+ private void loadInternal(final Context context, final File library) {
+ String libraryPath = library.getAbsolutePath();
+ if (loadedLibraries.contains(libraryPath) && !force) {
+ log("%s already loaded previously!", libraryPath);
+ return;
+ }
+
+ try {
+ libraryLoader.loadPath(libraryPath);
+ loadedLibraries.add(libraryPath);
+ log("%s (%s) was loaded normally!", libraryPath);
+ return;
+ } catch (final UnsatisfiedLinkError e) {
+ // :-(
+ log("Loading the library normally failed: %s", Log.getStackTraceString(e));
+ }
+
+ log("%s (%s) was not loaded normally, re-linking...", libraryPath);
+
+ if (recursive) {
+ loadDependencies(context, library);
+ }
+
+ libraryLoader.loadPath(libraryPath);
+ loadedLibraries.add(libraryPath);
+ log("%s (%s) was re-linked!", libraryPath);
+ }
+
+ private void loadDependencies(final Context context, final File lib) {
try {
- if (recursive) {
- ElfParser parser = null;
- final List