diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a789136e..bb5852b7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,7 +33,7 @@ android { debug { ndk { // Include x86_64 for emulator support during development - abiFilters += listOf("arm64-v8a", "x86_64") + abiFilters += listOf("arm64-v8a", "x86_64", "armeabi-v7a", "x86") } } release { @@ -52,7 +52,7 @@ android { abi { isEnable = true reset() - include("arm64-v8a", "x86_64") + include("arm64-v8a", "x86_64", "armeabi-v7a", "x86") isUniversalApk = true // For F-Droid and fallback } } diff --git a/app/src/main/jniLibs/arm64-v8a/libarti_android.so b/app/src/main/jniLibs/arm64-v8a/libarti_android.so index ba4f614b..f4776ae5 100755 Binary files a/app/src/main/jniLibs/arm64-v8a/libarti_android.so and b/app/src/main/jniLibs/arm64-v8a/libarti_android.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libarti_android.so b/app/src/main/jniLibs/armeabi-v7a/libarti_android.so new file mode 100755 index 00000000..846f0842 Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/libarti_android.so differ diff --git a/app/src/main/jniLibs/x86/libarti_android.so b/app/src/main/jniLibs/x86/libarti_android.so new file mode 100755 index 00000000..c3b7b5c6 Binary files /dev/null and b/app/src/main/jniLibs/x86/libarti_android.so differ diff --git a/app/src/main/jniLibs/x86_64/libarti_android.so b/app/src/main/jniLibs/x86_64/libarti_android.so index 9a1e27b6..7b632704 100755 Binary files a/app/src/main/jniLibs/x86_64/libarti_android.so and b/app/src/main/jniLibs/x86_64/libarti_android.so differ diff --git a/tools/arti-build/ARTI_VERSION b/tools/arti-build/ARTI_VERSION index c68d1ff0..5b590193 100644 --- a/tools/arti-build/ARTI_VERSION +++ b/tools/arti-build/ARTI_VERSION @@ -1 +1 @@ -arti-v1.7.0 +arti-v1.9.0 \ No newline at end of file diff --git a/tools/arti-build/build-arti.sh b/tools/arti-build/build-arti.sh index 0a592be5..2a31fefa 100755 --- a/tools/arti-build/build-arti.sh +++ b/tools/arti-build/build-arti.sh @@ -129,15 +129,17 @@ done # Architectures to build if [ "$RELEASE_ONLY" = true ]; then - TARGETS=("aarch64-linux-android") + TARGETS=("aarch64-linux-android" "armv7-linux-androideabi") else - TARGETS=("aarch64-linux-android" "x86_64-linux-android") + TARGETS=("aarch64-linux-android" "x86_64-linux-android" "armv7-linux-androideabi" "i686-linux-android") fi # Map Rust targets to Android ABI names declare -A ABI_MAP=( ["aarch64-linux-android"]="arm64-v8a" ["x86_64-linux-android"]="x86_64" + ["armv7-linux-androideabi"]="armeabi-v7a" + ["i686-linux-android"]="x86" ) # Toolchain placeholders (set in detect_ndk_host) @@ -331,6 +333,18 @@ clone_or_update_arti() { git clean -ffdqx --quiet print_success "Arti source ready at version $VERSION" + + # Apply patches + if [ -d "$SCRIPT_DIR/patches" ]; then + print_info "Applying patches..." + for patch in "$SCRIPT_DIR/patches"/*.patch; do + if [ -f "$patch" ]; then + print_info "Applying $(basename "$patch")" + git apply "$patch" || { print_error "Failed to apply $patch"; exit 1; } + fi + done + fi + echo "" }