avoid explicitly loading libs; they can be loaded by the generated module

Author: ktoso

Samples/SwiftKitSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java

@@ -32,20 +32,6 @@ public static void main(String[] args) {
         boolean traceDowncalls = Boolean.getBoolean("jextract.trace.downcalls");
         System.out.println("Property: jextract.trace.downcalls = " + traceDowncalls);
 
-        final var dylibNames = List.of(
-                "swiftCore",
-                "ExampleSwiftLibrary"
-        );
-
-
-        System.out.println("Loading libraries...");
-
-        for (var lib : dylibNames) {
-            System.out.printf("Loading: %s... ", lib);
-            System.loadLibrary(lib);
-            System.out.println("ok.");
-        }
-
         examples();
     }
 

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -100,6 +100,9 @@ extension Swift2JavaTranslator {
     printImports(&printer)
 
     printModuleClass(&printer) { printer in
+
+      printStaticLibraryLoad(&printer)
+
       // TODO: print all "static" methods
       for decl in importedGlobalFuncs {
         printFunctionDowncallMethods(&printer, decl)
@@ -266,7 +269,7 @@ extension Swift2JavaTranslator {
   private func printClassConstants(printer: inout CodePrinter) {
     printer.print(
       """
-      static final String DYLIB_NAME = "\(swiftModuleName)";
+      static final String LIB_NAME = "\(swiftModuleName)";
       static final Arena LIBRARY_ARENA = Arena.ofAuto();
       """
     )
@@ -458,6 +461,17 @@ extension Swift2JavaTranslator {
     )
   }
 
+  public func printStaticLibraryLoad(_ printer: inout CodePrinter) {
+    printer.print(
+      """
+      static {
+          System.loadLibrary("swiftCore");
+          System.loadLibrary(LIB_NAME);
+      }
+      """
+    )
+  }
+
   public func printFunctionDowncallMethods(_ printer: inout CodePrinter, _ decl: ImportedFunc) {
     printer.printSeparator(decl.identifier)