frost/secp256k1-kmp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android loading may fallback to standard JVM (#9)

Browse Source 
* Android loading may fallback to standard JVM

* Java code must target JVM 1.8 in order to be compatible Android.

Co-authored-by: Salomon BRYS <salomon@kodein.net>
This commit is contained in:
Salomon BRYS
2020-07-16 22:21:30 +02:00
committed by GitHub
parent 0cc4c251f9
commit dbf8301f34
6 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/NativeSecp256k1Loader.kt → jni/jvm/src/main/kotlin/fr/acinq/secp256k1/jni/NativeSecp256k1JvmLoader.kt
View File

@@ -14,7 +14,7 @@ import java.util.*
*
* @author leo
*/
public object NativeSecp256k1Loader {
public object NativeSecp256k1JvmLoader {
private var extracted = false
/**
@@ -106,7 +106,7 @@ public object NativeSecp256k1Loader {
val extractedLckFile = File(targetDirectory, extractedLckFileName)
return try {
// Extract a native library file into the target directory
val reader = NativeSecp256k1Loader::class.java.getResourceAsStream(libPath)
val reader = NativeSecp256k1JvmLoader::class.java.getResourceAsStream(libPath)
if (!extractedLckFile.exists()) {
FileOutputStream(extractedLckFile).close()
}
@@ -132,7 +132,7 @@ public object NativeSecp256k1Loader {
extractedLibFile.setExecutable(true)
// Check whether the contents are properly copied from the resource folder
NativeSecp256k1Loader::class.java.getResourceAsStream(libPath).use { nativeIn ->
NativeSecp256k1JvmLoader::class.java.getResourceAsStream(libPath).use { nativeIn ->
FileInputStream(extractedLibFile).use { extractedLibIn ->
if (!nativeIn.contentsEquals(extractedLibIn)) {
throw RuntimeException(
@@ -196,9 +196,9 @@ public object NativeSecp256k1Loader {
}
// Load the os-dependent library from the jar file
val packagePath = NativeSecp256k1Loader::class.java.getPackage().name.replace("\\.".toRegex(), "/")
val packagePath = NativeSecp256k1JvmLoader::class.java.getPackage().name.replace("\\.".toRegex(), "/")
val embeddedLibraryPath = "/$packagePath/native/${OSInfo.nativeSuffix}"
val hasNativeLib = NativeSecp256k1Loader::class.java.getResource("$embeddedLibraryPath/$libraryName") != null
val hasNativeLib = NativeSecp256k1JvmLoader::class.java.getResource("$embeddedLibraryPath/$libraryName") != null
if (!hasNativeLib) {
error("No native library found: at $embeddedLibraryPath/$libraryName")
}