rapidyaml works in ys native-image now

Author: ingydotnet

common/native.mk

@@ -6,24 +6,17 @@ NATIVE_OPTS := \
   --initialize-at-build-time \
   --enable-preview \
   --enable-url-protocols=https \
+  --emit=build-report \
   -march=compatibility \
+  -H:IncludeResources=SCI_VERSION \
+  -H:IncludeResources='librapidyaml\.0\.8\.0\.so' \
   -H:ReflectionConfigurationFiles=reflection.json \
   -H:+ReportExceptionStackTraces \
-  -H:IncludeResources=SCI_VERSION \
   -H:Log=registerResource: \
   -J-Dclojure.spec.skip-macros=true \
   -J-Dclojure.compiler.direct-linking=true \
   -J-Xmx3g \
 
-ifdef YS_NATIVE_INCLUDE_LIBRAPIDYAML
-NATIVE_OPTS += \
-  -H:IncludeResources=".*librapidyaml\.0\.8\.0\.so"
-endif
-
-ifdef YS_NATIVE_BUILD_REPORT
-NATIVE_OPTS += --emit build-report
-endif
-
 export MUSL_HOME := $(YS_TMP)/musl
 export PATH := $(MUSL_HOME)/bin:$(PATH)
 

rapidyaml/src/main/java/org/rapidyaml/NativeLibLoader.java

@@ -11,7 +11,7 @@ class NativeLibLoader {
     public static void loadLibraryFromResource(String libraryName)
         throws IOException
     {
-System.out.println("libraryName: " + libraryName);
+// System.out.println("libraryName: " + libraryName);
         ClassLoader classLoader =
             Thread.currentThread().getContextClassLoader();
 
@@ -23,12 +23,12 @@ public static void loadLibraryFromResource(String libraryName)
                 "Failed to load library resource '" +
                 libraryName + "' from NativeLibLoader");
 
-System.out.println("inputStream: " + inputStream);
+// System.out.println("inputStream: " + inputStream);
 
         File tempDir = createTempDir();
         // tempDir.deleteOnExit();
         File tempFile = new File(tempDir, libraryName);
-System.out.println("tempFile: " + tempFile);
+// System.out.println("tempFile: " + tempFile);
 
         Files.copy(
             inputStream,
@@ -44,7 +44,7 @@ public static void loadLibraryFromResource(String libraryName)
             // tempFile.delete();
         }
 
-System.out.println("Loaded library from temp file");
+// System.out.println("Loaded library from temp file");
     }
 
     private static File createTempDir() throws IOException {