Core: Try to load native libs smartly.

e3ndr · e3ndr · commit 84bd9ec17305 · 2024-02-06T14:51:55.000-06:00
diff --git a/core/src/main/java/dev/webview/webview_java/WebviewNative.java b/core/src/main/java/dev/webview/webview_java/WebviewNative.java
@@ -83,6 +83,7 @@ private static WebviewNative runSetup() {
             }
 
             try {
+                // Copy it to a file.
                 InputStream in = WebviewNative.class.getResourceAsStream(lib.toLowerCase());
                 byte[] bytes = StreamUtil.toBytes(in);
                 Files.write(target.toPath(), bytes);
@@ -92,6 +93,8 @@ private static WebviewNative runSetup() {
                 System.err.println("Unable to extract native: " + lib);
                 throw e;
             }
+
+            System.load(target.getAbsolutePath()); // Load it. This is so Native will be able to link it.
         }
 
         return Native.load("webview", WebviewNative.class);

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ private static WebviewNative runSetup() {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`try {`
	`86`	`+ // Copy it to a file.`
`86`	`87`	`InputStream in = WebviewNative.class.getResourceAsStream(lib.toLowerCase());`
`87`	`88`	`byte[] bytes = StreamUtil.toBytes(in);`
`88`	`89`	`Files.write(target.toPath(), bytes);`
`@@ -92,6 +93,8 @@ private static WebviewNative runSetup() {`
`92`	`93`	`System.err.println("Unable to extract native: " + lib);`
`93`	`94`	`throw e;`
`94`	`95`	`}`
	`96`	`+`
	`97`	`+ System.load(target.getAbsolutePath()); // Load it. This is so Native will be able to link it.`
`95`	`98`	`}`
`96`	`99`
`97`	`100`	`return Native.load("webview", WebviewNative.class);`