fix native lib extraction

lhns · Aug 2, 2021 · 65ee752 · 65ee752
1 parent b1abbb8
commit 65ee752
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,6 +43,12 @@ android {
     buildFeatures {
         viewBinding true
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
 }
 
 dependencies {

diff --git a/app/src/main/java/de/lolhens/resticui/restic/Restic.kt b/app/src/main/java/de/lolhens/resticui/restic/Restic.kt
@@ -9,10 +9,13 @@ import java.util.concurrent.CompletableFuture
 class Restic(
     private val storage: ResticStorage
 ) {
-    private val proot = storage.lib().resolve("proot")
-    private val restic = storage.lib().resolve("restic")
-    private val loader = storage.lib().resolve("loader")
-    private val loader32 = storage.lib().resolve("loader32")
+    private fun executable(name: String) =
+        storage.lib().resolve("libdata_$name.so")
+
+    private val proot = executable("proot")
+    private val restic = executable("restic")
+    private val loader = executable("loader")
+    private val loader32 = executable("loader32")
 
     private fun binds(hostsFile: File): List<Pair<String, String>> = listOf(
         Pair("/system", "/system"),

diff --git a/app/src/main/resources/lib/arm64-v8a/loader b/app/src/main/resources/lib/arm64-v8a/loader
diff --git a/app/src/main/resources/lib/arm64-v8a/loader32 b/app/src/main/resources/lib/arm64-v8a/loader32
diff --git a/app/src/main/resources/lib/arm64-v8a/proot b/app/src/main/resources/lib/arm64-v8a/proot
diff --git a/app/src/main/resources/lib/arm64-v8a/restic b/app/src/main/resources/lib/arm64-v8a/restic
diff --git a/app/src/main/resources/lib/armeabi-v71/loader b/app/src/main/resources/lib/armeabi-v71/loader
diff --git a/app/src/main/resources/lib/armeabi-v71/proot b/app/src/main/resources/lib/armeabi-v71/proot
diff --git a/app/src/main/resources/lib/armeabi-v71/restic b/app/src/main/resources/lib/armeabi-v71/restic
diff --git a/app/src/main/resources/lib/x86/loader b/app/src/main/resources/lib/x86/loader
diff --git a/app/src/main/resources/lib/x86/proot b/app/src/main/resources/lib/x86/proot
diff --git a/app/src/main/resources/lib/x86/restic b/app/src/main/resources/lib/x86/restic
diff --git a/app/src/main/resources/lib/x86_64/loader b/app/src/main/resources/lib/x86_64/loader
diff --git a/app/src/main/resources/lib/x86_64/loader32 b/app/src/main/resources/lib/x86_64/loader32
diff --git a/app/src/main/resources/lib/x86_64/proot b/app/src/main/resources/lib/x86_64/proot
diff --git a/app/src/main/resources/lib/x86_64/restic b/app/src/main/resources/lib/x86_64/restic