diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 839d58a39..c6b88b694 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -100,6 +100,9 @@ play { dependencies { androidTestImplementation(Libs.leakcanary_android_instrumentation) + api(fileTree(mapOf("include" to "*.aar", "dir" to "libs"))) + implementation("com.getkeepsafe.relinker:relinker:1.4.5") + implementation(files("C:\\Users\\aades\\OneDrive\\Documents/lib-debug.aar")) } task("generateVersionCodeAndName") { val file = File("VERSION_INFO") diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index f9f01e338..f4dc540fa 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -344,9 +344,4 @@ object Libs { * https://developer.android.com/testing */ const val junit: String = "androidx.test.ext:junit:" + Versions.junit - - /** - * https://github.com/KeepSafe/ReLinker - */ - const val relinker: String = "com.getkeepsafe.relinker:relinker:" + Versions.relinker } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 12d3b3982..74657444f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -101,8 +101,6 @@ object Versions { const val webkit: String = "1.3.0" const val junit: String = "1.1.4" - - const val relinker: String = "1.4.5" } /** diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 865d9c073..48f440cd0 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -60,14 +60,15 @@ dependencies { implementation(Libs.threetenabp) // Get kiwixlib online if it is not populated locally - if (!shouldUseLocalVersion()) { - api(Libs.kiwixlib) - } else { - api(fileTree(mapOf("include" to "*.aar", "dir" to "libs"))) - } + // if (!shouldUseLocalVersion()) { + // api(Libs.kiwixlib) + // } else { + // api(fileTree(mapOf("include" to "*.aar", "dir" to "libs"))) + // } - // Relinker to load libkiwix - implementation(Libs.relinker) + api(fileTree(mapOf("include" to "*.aar", "dir" to "libs"))) + implementation("com.getkeepsafe.relinker:relinker:1.4.5") + implementation(files("C:\\Users\\aades\\OneDrive\\Documents/lib-debug.aar")) // Document File implementation(Libs.select_folder_document_file) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/JNIInitialiser.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/JNIInitialiser.kt index 5b25d6f66..f95a2cb81 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/JNIInitialiser.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/JNIInitialiser.kt @@ -19,7 +19,6 @@ package org.kiwix.kiwixmobile.core import android.content.Context import android.util.Log -import com.getkeepsafe.relinker.ReLinker import org.kiwix.libkiwix.JNIKiwix import org.kiwix.kiwixmobile.core.utils.TAG_KIWIX import java.io.File @@ -28,12 +27,7 @@ import javax.inject.Inject internal class JNIInitialiser @Inject constructor(context: Context, jniKiwix: JNIKiwix) { init { - /* Load wrapper's .so files which we have missed to load in libkiwix - More information here https://github.com/kiwix/java-libkiwix/issues/39 - */ - ReLinker.loadLibrary(context, "kiwix_wrapper") - ReLinker.loadLibrary(context, "zim_wrapper") - // loadICUData(context)?.let(jniKiwix::setDataDirectory) + loadICUData(context)?.let(jniKiwix::setDataDirectory) } private fun loadICUData(context: Context): String? {