fixed native binary extraction

lhns · Aug 2, 2021 · cf2c320 · cf2c320
1 parent 420a0f9
commit cf2c320
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/de/lolhens/resticui/restic/Restic.kt b/app/src/main/java/de/lolhens/resticui/restic/Restic.kt
@@ -1,5 +1,6 @@
 package de.lolhens.resticui.restic
 
+import android.system.Os
 import java.io.File
 import java.io.InputStream
 import java.net.InetAddress
@@ -12,6 +13,19 @@ class Restic(
  private fun executable(name: String) =
  storage.lib().resolve("libdata_$name.so")
 
+ private val lib = storage.cache().resolve("lib")
+
+ private fun initLib(name: String) {
+ lib.mkdirs()
+ val linkFile = lib.resolve(name)
+ linkFile.delete()
+ Os.symlink(executable(name).absolutePath, linkFile.absolutePath)
+ }
+
+ init {
+ initLib("libtalloc.so.2")
+ }
+
  private val proot = executable("proot")
  private val restic = executable("restic")
  private val loader = executable("loader")
@@ -39,7 +53,7 @@ class Restic(
  private fun vars(): List<Pair<String, String>> = listOf(
  Pair("PATH", "/system/bin"),
  Pair("TMPDIR", storage.cache().absolutePath),
- Pair("LD_LIBRARY_PATH", storage.lib().absolutePath),
+ Pair("LD_LIBRARY_PATH", lib.absolutePath),
  Pair("PROOT_LOADER", loader.absolutePath),
  Pair("PROOT_LOADER_32", loader32.absolutePath),
  Pair("PROOT_TMP_DIR", storage.cache().absolutePath),

diff --git a/...in/resources/lib/arm64-v8a/libtalloc.so.2 → ...iLibs/arm64-v8a/libdata_libtalloc.so.2.so b/...in/resources/lib/arm64-v8a/libtalloc.so.2 → ...iLibs/arm64-v8a/libdata_libtalloc.so.2.so
diff --git a/...resources/lib/arm64-v8a/libdata_loader.so → .../main/jniLibs/arm64-v8a/libdata_loader.so b/...resources/lib/arm64-v8a/libdata_loader.so → .../main/jniLibs/arm64-v8a/libdata_loader.so
diff --git a/...sources/lib/arm64-v8a/libdata_loader32.so → ...ain/jniLibs/arm64-v8a/libdata_loader32.so b/...sources/lib/arm64-v8a/libdata_loader32.so → ...ain/jniLibs/arm64-v8a/libdata_loader32.so
diff --git a/.../resources/lib/arm64-v8a/libdata_proot.so → ...c/main/jniLibs/arm64-v8a/libdata_proot.so b/.../resources/lib/arm64-v8a/libdata_proot.so → ...c/main/jniLibs/arm64-v8a/libdata_proot.so
diff --git a/...resources/lib/arm64-v8a/libdata_restic.so → .../main/jniLibs/arm64-v8a/libdata_restic.so b/...resources/lib/arm64-v8a/libdata_restic.so → .../main/jniLibs/arm64-v8a/libdata_restic.so
diff --git a/.../resources/lib/armeabi-v71/libtalloc.so.2 → ...ibs/armeabi-v71/libdata_libtalloc.so.2.so b/.../resources/lib/armeabi-v71/libtalloc.so.2 → ...ibs/armeabi-v71/libdata_libtalloc.so.2.so
diff --git a/...esources/lib/armeabi-v71/libdataloader.so → ...ain/jniLibs/armeabi-v71/libdata_loader.so b/...esources/lib/armeabi-v71/libdataloader.so → ...ain/jniLibs/armeabi-v71/libdata_loader.so
diff --git a/...esources/lib/armeabi-v71/libdata_proot.so → ...main/jniLibs/armeabi-v71/libdata_proot.so b/...esources/lib/armeabi-v71/libdata_proot.so → ...main/jniLibs/armeabi-v71/libdata_proot.so
diff --git a/...sources/lib/armeabi-v71/libdata_restic.so → ...ain/jniLibs/armeabi-v71/libdata_restic.so b/...sources/lib/armeabi-v71/libdata_restic.so → ...ain/jniLibs/armeabi-v71/libdata_restic.so
diff --git a/...src/main/resources/lib/x86/libtalloc.so.2 → ...ain/jniLibs/x86/libdata_libtalloc.so.2.so b/...src/main/resources/lib/x86/libtalloc.so.2 → ...ain/jniLibs/x86/libdata_libtalloc.so.2.so
diff --git a/.../main/resources/lib/x86/libdata_loader.so → app/src/main/jniLibs/x86/libdata_loader.so b/.../main/resources/lib/x86/libdata_loader.so → app/src/main/jniLibs/x86/libdata_loader.so
diff --git a/...c/main/resources/lib/x86/libdata_proot.so → app/src/main/jniLibs/x86/libdata_proot.so b/...c/main/resources/lib/x86/libdata_proot.so → app/src/main/jniLibs/x86/libdata_proot.so
diff --git a/.../main/resources/lib/x86/libdata_restic.so → app/src/main/jniLibs/x86/libdata_restic.so b/.../main/resources/lib/x86/libdata_restic.so → app/src/main/jniLibs/x86/libdata_restic.so
diff --git a/.../main/resources/lib/x86_64/libtalloc.so.2 → .../jniLibs/x86_64/libdata_libtalloc.so.2.so b/.../main/resources/lib/x86_64/libtalloc.so.2 → .../jniLibs/x86_64/libdata_libtalloc.so.2.so
diff --git a/...in/resources/lib/x86_64/libdata_loader.so → ...src/main/jniLibs/x86_64/libdata_loader.so b/...in/resources/lib/x86_64/libdata_loader.so → ...src/main/jniLibs/x86_64/libdata_loader.so
diff --git a/.../resources/lib/x86_64/libdata_loader32.so → ...c/main/jniLibs/x86_64/libdata_loader32.so b/.../resources/lib/x86_64/libdata_loader32.so → ...c/main/jniLibs/x86_64/libdata_loader32.so
diff --git a/...ain/resources/lib/x86_64/libdata_proot.so → app/src/main/jniLibs/x86_64/libdata_proot.so b/...ain/resources/lib/x86_64/libdata_proot.so → app/src/main/jniLibs/x86_64/libdata_proot.so
diff --git a/...in/resources/lib/x86_64/libdata_restic.so → ...src/main/jniLibs/x86_64/libdata_restic.so b/...in/resources/lib/x86_64/libdata_restic.so → ...src/main/jniLibs/x86_64/libdata_restic.so