From 66a39dfaf81138cfb24b8f09390bb9c55e02b324 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 24 Sep 2026 23:22:11 +0200
Subject: [PATCH 1/7] update ndk and add armeabi-v7a support

---
 .github/workflows/ci.yml      |  2 +-
 .github/workflows/debug.yml   |  2 +-
 .github/workflows/nightly.yml |  2 +-
 .github/workflows/release.yml |  2 +-
 BUILD.md                      |  2 +-
 README.md                     |  2 +-
 app/build.gradle.kts          |  2 +-
 app/src/main/rust/Makefile    | 16 ++++++++++++----
 app/src/main/rust/justfile    |  2 +-
 flake.nix                     |  1 +
 10 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 255979b5..b37a2bed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.versions.outputs.rust }}
-          targets: aarch64-linux-android, x86_64-linux-android
+          targets: aarch64-linux-android, x86_64-linux-android, armv7-linux-androideabi
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 9759f18f..bc28475e 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -39,7 +39,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.versions.outputs.rust }}
-          targets: aarch64-linux-android, x86_64-linux-android
+          targets: aarch64-linux-android, x86_64-linux-android, armv7-linux-androideabi
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2f6d8e0f..c874605e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.versions.outputs.rust }}
-          targets: aarch64-linux-android, x86_64-linux-android
+          targets: aarch64-linux-android, x86_64-linux-android, armv7-linux-androideabi
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33778f06..37c3b752 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,7 +49,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.versions.outputs.rust }}
-          targets: aarch64-linux-android, x86_64-linux-android
+          targets: aarch64-linux-android, x86_64-linux-android, armv7-linux-androideabi
 
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/BUILD.md b/BUILD.md
index cc9526f4..5119101c 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -5,7 +5,7 @@
 It simpler to build on Linux. You will need need to install
 
 - [Rust](https://www.rust-lang.org/tools/install)
-- install the necessary targets: `rustup target add x86_64-linux-android aarch64-linux-android`
+- install the necessary targets: `rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi`
 - perl
 - make
 
diff --git a/README.md b/README.md
index ceb9285f..e1284b6c 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Because all apps which integrate git on Android either separate the note title f
 
 _Supported Android versions: 11 to 16_
 
-_Supported Architecture: `arm64-v8a`, `x86_64`_
+_Supported Architecture: `arm64-v8a`, `x86_64`, `armeabi-v7a`_
 
 # Build
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 28a6bd95..1075e3f5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -69,7 +69,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
-            abiFilters += listOf("arm64-v8a", "x86_64")
+            abiFilters += listOf("arm64-v8a", "x86_64", "armeabi-v7a")
         }
 
     }
diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index 11df9995..5cdd623e 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -22,11 +22,13 @@ ifeq ($(OS),Windows_NT)
 	export OPENSSL_NO_VENDOR_PRIV ?= 1
 	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang.cmd
 	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang.cmd
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7-linux-androideabi${MIN_SDK}-clang.cmd
 else
 	NDK_PATH ?= ${HOME}/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/linux-x86_64/bin
 	export OPENSSL_NO_VENDOR_PRIV ?= 0
 	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang
 	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7-linux-androideabi${MIN_SDK}-clang
 endif
 
 
@@ -46,16 +48,19 @@ build_install: build cp_to_jni
 build_zip: build zip_openssl_build_all
 
 unzip_openssl_prebuild:
-	unzip openssl-prebuild/x86_64/install.zip
-	unzip openssl-prebuild/aarch64/install.zip
+	unzip openssl-prebuild/x86_64-linux-android/install.zip
+	unzip openssl-prebuild/aarch64-linux-android/install.zip
+	unzip openssl-prebuild/armv7-linux-androideabi/install.zip
 
 build:
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) cargo build ${ARGS} --target=x86_64-linux-android
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) cargo build ${ARGS} --target=aarch64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armeabi-v7a/install) cargo build ${ARGS} --target=armv7-linux-androideabi
 else
 	cargo build ${ARGS} --target=x86_64-linux-android
 	cargo build ${ARGS} --target=aarch64-linux-android
+	cargo build ${ARGS} --target=armv7-linux-androideabi
 endif
 
 cp_to_jni:
@@ -63,10 +68,13 @@ cp_to_jni:
 	cp target/x86_64-linux-android/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/x86_64/
 	mkdir -p ../jniLibs/arm64-v8a
 	cp target/aarch64-linux-android/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/arm64-v8a/
+	mkdir -p ../jniLibs/armeabi-v7a
+	cp target/armv7-linux-androideabi/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/armeabi-v7a/
 
 zip_openssl_build_all:
-	just zip_openssl_build x86_64
-	just zip_openssl_build aarch64
+	just zip_openssl_build x86_64-linux-android
+	just zip_openssl_build aarch64-linux-android
+	just zip_openssl_build armv7-linux-androideabi
 
 
 fix:
diff --git a/app/src/main/rust/justfile b/app/src/main/rust/justfile
index 16aab06a..aed09c4b 100644
--- a/app/src/main/rust/justfile
+++ b/app/src/main/rust/justfile
@@ -2,7 +2,7 @@ set windows-shell := ["powershell.exe", "-NoLogo", "-Command"]
 
 zip_openssl_build arch:
     rm -rf openssl-prebuild/{{ arch }}/*
-    cp -r target/{{ arch }}-linux-android/release/build/openssl-sys-*/out/openssl-build/install openssl-prebuild/{{ arch }}
+    cp -r target/{{ arch }}/release/build/openssl-sys-*/out/openssl-build/install openssl-prebuild/{{ arch }}
     zip -r install.zip openssl-prebuild/{{ arch }}/install
     mv install.zip openssl-prebuild/{{ arch }}
 pull: prettier fix
diff --git a/flake.nix b/flake.nix
index cdae8c13..ae7bc079 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,7 @@
         targets = [
           "aarch64-linux-android"
           "x86_64-linux-android"
+          "armv7-linux-androideabi"
         ];
         extensions = [
           "rust-src"

From 269c7f11c82cae79bf69338bde2285e7d1078a14 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 16:18:45 +0200
Subject: [PATCH 2/7] fix build

---
 app/src/main/rust/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index 5cdd623e..aa47c1cd 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -22,13 +22,13 @@ ifeq ($(OS),Windows_NT)
 	export OPENSSL_NO_VENDOR_PRIV ?= 1
 	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang.cmd
 	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang.cmd
-	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7-linux-androideabi${MIN_SDK}-clang.cmd
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi${MIN_SDK}-clang.cmd
 else
 	NDK_PATH ?= ${HOME}/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/linux-x86_64/bin
 	export OPENSSL_NO_VENDOR_PRIV ?= 0
 	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang
 	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang
-	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7-linux-androideabi${MIN_SDK}-clang
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi${MIN_SDK}-clang
 endif
 
 
@@ -53,6 +53,8 @@ unzip_openssl_prebuild:
 	unzip openssl-prebuild/armv7-linux-androideabi/install.zip
 
 build:
+	# https://github.com/rust-lang/cc-rs/issues/1440
+	ln -sf "${NDK_PATH}armv7a-linux-androideabi21-clang" "${NDK_PATH}arm-linux-androideabi-clang"
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) cargo build ${ARGS} --target=x86_64-linux-android
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) cargo build ${ARGS} --target=aarch64-linux-android

From fd879633ffb4dfa88cf00e915d432e4eb336f57b Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 16:26:02 +0200
Subject: [PATCH 3/7] Update Makefile

---
 app/src/main/rust/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index aa47c1cd..7ca8323f 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -54,7 +54,7 @@ unzip_openssl_prebuild:
 
 build:
 	# https://github.com/rust-lang/cc-rs/issues/1440
-	ln -sf "${NDK_PATH}armv7a-linux-androideabi21-clang" "${NDK_PATH}arm-linux-androideabi-clang"
+	ln -sf "${NDK_PATH}/armv7a-linux-androideabi21-clang" "${NDK_PATH}/arm-linux-androideabi-clang"
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) cargo build ${ARGS} --target=x86_64-linux-android
 	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) cargo build ${ARGS} --target=aarch64-linux-android

From ca446bf82b42dc821bf23a1fbc138071ed8b46f3 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 20:13:23 +0200
Subject: [PATCH 4/7] reuse CARGO_TARGET_

---
 app/src/main/rust/Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index 7ca8323f..2c17c49b 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -52,17 +52,16 @@ unzip_openssl_prebuild:
 	unzip openssl-prebuild/aarch64-linux-android/install.zip
 	unzip openssl-prebuild/armv7-linux-androideabi/install.zip
 
+# https://github.com/rust-lang/cc-rs/issues/1440
 build:
-	# https://github.com/rust-lang/cc-rs/issues/1440
-	ln -sf "${NDK_PATH}/armv7a-linux-androideabi21-clang" "${NDK_PATH}/arm-linux-androideabi-clang"
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) cargo build ${ARGS} --target=x86_64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) cargo build ${ARGS} --target=aarch64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armeabi-v7a/install) cargo build ${ARGS} --target=armv7-linux-androideabi
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armeabi-v7a/install) CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
 else
-	cargo build ${ARGS} --target=x86_64-linux-android
-	cargo build ${ARGS} --target=aarch64-linux-android
-	cargo build ${ARGS} --target=armv7-linux-androideabi
+	CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
+	CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
+	CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
 endif
 
 cp_to_jni:

From 51dc0c0a1fa06cdc503166b753930cd30c3f1bb4 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 20:17:28 +0200
Subject: [PATCH 5/7] Update RUST_VERSION

---
 app/src/main/rust/RUST_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/rust/RUST_VERSION b/app/src/main/rust/RUST_VERSION
index 1bb9e383..3bd6c568 100644
--- a/app/src/main/rust/RUST_VERSION
+++ b/app/src/main/rust/RUST_VERSION
@@ -1 +1 @@
-1.98.1
\ No newline at end of file
+1.99.1

From 201afd033ece1564cd2627821bd0d5a6b180c606 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 20:45:24 +0200
Subject: [PATCH 6/7] add

---
 app/src/main/rust/.gitignore                        |  3 ++-
 app/src/main/rust/Makefile                          | 12 ++++++------
 app/src/main/rust/justfile                          |  4 ++--
 .../rust/openssl-prebuild/aarch64-linux-android.zip |  3 +++
 .../main/rust/openssl-prebuild/aarch64/install.zip  |  3 ---
 .../openssl-prebuild/armv7-linux-androideabi.zip    |  3 +++
 .../rust/openssl-prebuild/x86_64-linux-android.zip  |  3 +++
 .../main/rust/openssl-prebuild/x86_64/install.zip   |  3 ---
 app/src/main/rust/src/libgit2/mod.rs                | 13 +++++++------
 9 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/rust/openssl-prebuild/aarch64-linux-android.zip
 delete mode 100644 app/src/main/rust/openssl-prebuild/aarch64/install.zip
 create mode 100644 app/src/main/rust/openssl-prebuild/armv7-linux-androideabi.zip
 create mode 100644 app/src/main/rust/openssl-prebuild/x86_64-linux-android.zip
 delete mode 100644 app/src/main/rust/openssl-prebuild/x86_64/install.zip

diff --git a/app/src/main/rust/.gitignore b/app/src/main/rust/.gitignore
index 00f9c6db..b228c475 100644
--- a/app/src/main/rust/.gitignore
+++ b/app/src/main/rust/.gitignore
@@ -1,5 +1,6 @@
 target/
-/openssl-prebuild/*/install
+/openssl-prebuild/*
+!/openssl-prebuild/*.zip
 /vendor
 /repo_test
 /test_clone
\ No newline at end of file
diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index 2c17c49b..faf4498d 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -48,16 +48,16 @@ build_install: build cp_to_jni
 build_zip: build zip_openssl_build_all
 
 unzip_openssl_prebuild:
-	unzip openssl-prebuild/x86_64-linux-android/install.zip
-	unzip openssl-prebuild/aarch64-linux-android/install.zip
-	unzip openssl-prebuild/armv7-linux-androideabi/install.zip
+	unzip -o openssl-prebuild/x86_64-linux-android.zip
+	unzip -o openssl-prebuild/aarch64-linux-android.zip
+	unzip -o openssl-prebuild/armv7-linux-androideabi.zip
 
 # https://github.com/rust-lang/cc-rs/issues/1440
 build:
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64/install) CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64/install) CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armeabi-v7a/install) CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64-linux-android/install) CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64-linux-android/install) CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armv7-linux-androideabi/install) CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
 else
 	CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
 	CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
diff --git a/app/src/main/rust/justfile b/app/src/main/rust/justfile
index aed09c4b..007f4a8c 100644
--- a/app/src/main/rust/justfile
+++ b/app/src/main/rust/justfile
@@ -3,8 +3,8 @@ set windows-shell := ["powershell.exe", "-NoLogo", "-Command"]
 zip_openssl_build arch:
     rm -rf openssl-prebuild/{{ arch }}/*
     cp -r target/{{ arch }}/release/build/openssl-sys-*/out/openssl-build/install openssl-prebuild/{{ arch }}
-    zip -r install.zip openssl-prebuild/{{ arch }}/install
-    mv install.zip openssl-prebuild/{{ arch }}
+    zip -r openssl-prebuild/{{ arch }}.zip openssl-prebuild/{{ arch }}
+
 pull: prettier fix
 
 fix: fmt fmt-just
diff --git a/app/src/main/rust/openssl-prebuild/aarch64-linux-android.zip b/app/src/main/rust/openssl-prebuild/aarch64-linux-android.zip
new file mode 100644
index 00000000..ac1836f8
--- /dev/null
+++ b/app/src/main/rust/openssl-prebuild/aarch64-linux-android.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6a300565733c5a072d2f3ba36bc2b382cc2e0e3078735e347c57517b0275f03
+size 4773976
diff --git a/app/src/main/rust/openssl-prebuild/aarch64/install.zip b/app/src/main/rust/openssl-prebuild/aarch64/install.zip
deleted file mode 100644
index c8ff6f5a..00000000
--- a/app/src/main/rust/openssl-prebuild/aarch64/install.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81087d32d7ee3d83b085076c83feaa9178c457b5548776fa13a030c2ab65c246
-size 4768926
diff --git a/app/src/main/rust/openssl-prebuild/armv7-linux-androideabi.zip b/app/src/main/rust/openssl-prebuild/armv7-linux-androideabi.zip
new file mode 100644
index 00000000..6171978e
--- /dev/null
+++ b/app/src/main/rust/openssl-prebuild/armv7-linux-androideabi.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:195095a0f7e365002a40985afa7869bcf0e854117759b479f0c130ee58178bf9
+size 4171239
diff --git a/app/src/main/rust/openssl-prebuild/x86_64-linux-android.zip b/app/src/main/rust/openssl-prebuild/x86_64-linux-android.zip
new file mode 100644
index 00000000..223939de
--- /dev/null
+++ b/app/src/main/rust/openssl-prebuild/x86_64-linux-android.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b791ac2dd20d1fbd1ad2988cc210239553ecf6868c7ea052d1a068c1a74d1661
+size 4320372
diff --git a/app/src/main/rust/openssl-prebuild/x86_64/install.zip b/app/src/main/rust/openssl-prebuild/x86_64/install.zip
deleted file mode 100644
index e5a1cd9f..00000000
--- a/app/src/main/rust/openssl-prebuild/x86_64/install.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7b1286846388f522c48584216012721ba3e9f9b07f1f8f3489915abeb0f4160
-size 4266132
diff --git a/app/src/main/rust/src/libgit2/mod.rs b/app/src/main/rust/src/libgit2/mod.rs
index 3a06e1fa..7ba8c300 100644
--- a/app/src/main/rust/src/libgit2/mod.rs
+++ b/app/src/main/rust/src/libgit2/mod.rs
@@ -410,14 +410,15 @@ pub fn get_timestamps(
                         .extension()
                         .and_then(|e| e.to_str())
                         .unwrap_or(""),
-                ) {
-                    match path.as_os_str().to_str() {
-                        Some(path) => insert(path, commit.time().seconds() * 1000)?,
-                        None => {
-                            warn!("path can't be converted to str");
-                        }
+                )
+            {
+                match path.as_os_str().to_str() {
+                    Some(path) => insert(path, commit.time().seconds() * 1000)?,
+                    None => {
+                        warn!("path can't be converted to str");
                     }
                 }
+            }
         }
     }
 

From 76a1344541e7ae20e11b919fb75f4a60456072e4 Mon Sep 17 00:00:00 2001
From: wiiznokes <78230769+wiiznokes@users.noreply.github.com>
Date: Thu, 15 Oct 2026 20:55:45 +0200
Subject: [PATCH 7/7] ff

---
 app/src/main/rust/Makefile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/rust/Makefile b/app/src/main/rust/Makefile
index faf4498d..a50cf136 100644
--- a/app/src/main/rust/Makefile
+++ b/app/src/main/rust/Makefile
@@ -18,21 +18,21 @@ MIN_SDK := 21
 
 
 ifeq ($(OS),Windows_NT)
-	NDK_PATH ?= ${HOME}/AppData/Local/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/windows-x86_64/bin
+	NDK_PATH ?= $(HOME)/AppData/Local/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/windows-x86_64/bin
 	export OPENSSL_NO_VENDOR_PRIV ?= 1
-	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang.cmd
-	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang.cmd
-	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi${MIN_SDK}-clang.cmd
+	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android$(MIN_SDK)-clang.cmd
+	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android$(MIN_SDK)-clang.cmd
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi$(MIN_SDK)-clang.cmd
 else
-	NDK_PATH ?= ${HOME}/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/linux-x86_64/bin
+	NDK_PATH ?= $(HOME)/Android/Sdk/ndk/30.0.16248370/toolchains/llvm/prebuilt/linux-x86_64/bin
 	export OPENSSL_NO_VENDOR_PRIV ?= 0
-	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android${MIN_SDK}-clang
-	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android${MIN_SDK}-clang
-	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi${MIN_SDK}-clang
+	export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER := x86_64-linux-android$(MIN_SDK)-clang
+	export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER := aarch64-linux-android$(MIN_SDK)-clang
+	export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER := armv7a-linux-androideabi$(MIN_SDK)-clang
 endif
 
 
-export PATH := ${NDK_PATH}:$(PATH)
+export PATH := $(NDK_PATH):$(PATH)
 
 
 MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -55,22 +55,22 @@ unzip_openssl_prebuild:
 # https://github.com/rust-lang/cc-rs/issues/1440
 build:
 ifeq ($(OPENSSL_NO_VENDOR_PRIV),1)
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64-linux-android/install) CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64-linux-android/install) CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
-	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armv7-linux-androideabi/install) CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/x86_64-linux-android) CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build $(ARGS) --target=x86_64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/aarch64-linux-android) CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build $(ARGS) --target=aarch64-linux-android
+	OPENSSL_DIR=$(abspath $(MAKEFILE_DIR)/openssl-prebuild/armv7-linux-androideabi) CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build $(ARGS) --target=armv7-linux-androideabi
 else
-	CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=x86_64-linux-android
-	CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build ${ARGS} --target=aarch64-linux-android
-	CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build ${ARGS} --target=armv7-linux-androideabi
+	CC=$(CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER) cargo build $(ARGS) --target=x86_64-linux-android
+	CC=$(CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER) cargo build $(ARGS) --target=aarch64-linux-android
+	CC=$(CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER) cargo build $(ARGS) --target=armv7-linux-androideabi
 endif
 
 cp_to_jni:
 	mkdir -p ../jniLibs/x86_64
-	cp target/x86_64-linux-android/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/x86_64/
+	cp target/x86_64-linux-android/$(TARGET_PREFIX)/libgit_wrapper.so ../jniLibs/x86_64/
 	mkdir -p ../jniLibs/arm64-v8a
-	cp target/aarch64-linux-android/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/arm64-v8a/
+	cp target/aarch64-linux-android/$(TARGET_PREFIX)/libgit_wrapper.so ../jniLibs/arm64-v8a/
 	mkdir -p ../jniLibs/armeabi-v7a
-	cp target/armv7-linux-androideabi/${TARGET_PREFIX}/libgit_wrapper.so ../jniLibs/armeabi-v7a/
+	cp target/armv7-linux-androideabi/$(TARGET_PREFIX)/libgit_wrapper.so ../jniLibs/armeabi-v7a/
 
 zip_openssl_build_all:
 	just zip_openssl_build x86_64-linux-android