Replace custom loader with changed Library implementation.

JetBrains · Dec 10, 2020 · dd1a39d · dd1a39d
1 parent 82c9a74
commit dd1a39d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/skiko/build.gradle.kts b/skiko/build.gradle.kts
@@ -136,6 +136,10 @@ val skijaSrcDir = run {
             delombokSkijaSrcDir.deleteRecursively()
             delombokSkijaSrcDir.mkdirs()
         }
+        doLast {
+            // Remove Library.java from Skija.
+            file(delombokSkijaSrcDir.path + "/org/jetbrains/skija/impl/Library.java").delete()
+        }
     }.map { delombokSkijaSrcDir }
 }
 

diff --git a/skiko/src/jvmMain/kotlin/org/jetbrains/skija/CustomLoader.kt b/skiko/src/jvmMain/kotlin/org/jetbrains/skija/CustomLoader.kt
diff --git a/skiko/src/jvmMain/kotlin/org/jetbrains/skija/impl/Library.kt b/skiko/src/jvmMain/kotlin/org/jetbrains/skija/impl/Library.kt
@@ -0,0 +1,15 @@
+package org.jetbrains.skija.impl
+
+import org.jetbrains.skiko.Library
+
+class Library {
+    companion object {
+        @JvmStatic
+        fun staticLoad() {
+            Library.load()
+        }
+
+        @JvmStatic
+        external fun _nAfterLoad()
+    }
+}