X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fimpl%2Fbindings.java;h=49f921d2deef9cb8a24e88cc4683bb69dd874e28;hp=511f6839d654b27c996e47797530406319463a2a;hb=a442b8532ad57aed1fc740141189899b39a15d79;hpb=d9b8c9bffdd28a822aa23ef3f0b186170e49f55b

diff --git a/src/main/java/org/ldk/impl/bindings.java b/src/main/java/org/ldk/impl/bindings.java
index 511f6839..49f921d2 100644
--- a/src/main/java/org/ldk/impl/bindings.java
+++ b/src/main/java/org/ldk/impl/bindings.java
@@ -1,5 +1,11 @@
 package org.ldk.impl;
 import org.ldk.enums.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 
 public class bindings {
 	public static class VecOrSliceDef {
@@ -11,7 +17,24 @@ public class bindings {
 		}
 	}
 	static {
-		System.loadLibrary("lightningjni");
+		try {
+			// Try to load natively first, this works on Android and in testing.
+			System.loadLibrary("lightningjni");
+		} catch (UnsatisfiedLinkError _ignored) {
+			// Otherwise try to load from the library jar.
+			File tmpdir = new File(System.getProperty("java.io.tmpdir"), "ldk-java-nativelib");
+			tmpdir.mkdir(); // If it fails to create, assume it was there already
+			tmpdir.deleteOnExit();
+			String libname = "liblightningjni_" + System.getProperty("os.name").replaceAll(" ", "") +
+				"-" + System.getProperty("os.arch").replaceAll(" ", "") + ".nativelib";
+			try (InputStream is = bindings.class.getResourceAsStream("/" + libname)) {
+				Path libpath = new File(tmpdir.toPath().toString(), "liblightningjni.so").toPath();
+				Files.copy(is, libpath, StandardCopyOption.REPLACE_EXISTING);
+				Runtime.getRuntime().load(libpath.toString());
+			} catch (IOException e) {
+				throw new IllegalArgumentException(e);
+			}
+		}
 		init(java.lang.Enum.class, VecOrSliceDef.class);
 		init_class_cache();
 		if (!get_lib_version_string().equals(get_ldk_java_bindings_version()))
@@ -25,7 +48,7 @@ public class bindings {
 	static native String get_lib_version_string();
 
 	public static String get_ldk_java_bindings_version() {
-		return "v0.0.98.1";
+		return "v0.0.98.2";
 	}
 	public static native String get_ldk_c_bindings_version();
 	public static native String get_ldk_version();