Howard20181 · rojenzaman · Mar 28, 2019 · Mar 29, 2019 · Mar 29, 2019 · Apr 25, 2021
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.tar.gz
+*.sh
+*.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,97 @@
+## Changelog
+
+**2025-08-07**: v3.50.4 (_20250807_)
+
+- Updated to SQLite v3.50.4.
+
+**2025-02-20**: v3.49.1 (_20250220_)
+
+- Updated to SQLite v3.49.1.
+
+**2024-12-12**: v3.47.2 (_20241212_)
+
+- Updated to SQLite v3.47.2.
+
+**2024-12-11**: v3.47.1 (_20241211_)
+
+- Updated to SQLite v3.47.1.
+
+**2024-10-23**: v3.47.0 (_20241023_)
+
+- Updated to SQLite v3.47.0.
+
+**2024-08-25**: v3.46.1 (_20240825_)
+
+- Updated to SQLite v3.46.1.
+
+**2024-06-15**: v3.46.0 (_20240615_)
+
+- Updated to SQLite v3.46.0.
+
+**2024-04-18**: v3.45.3 (_20240418_)
+
+- Updated to SQLite v3.45.3.
+
+**2024-03-14**: v3.45.2 (_20240314_)
+
+- Updated to SQLite v3.45.2.
+
+**2024-02-04**: v3.45.1 (_20240204_)
+
+- Updated to SQLite v3.45.1.
+
+**2024-01-16**: v3.45.0 (_20240116_)
+
+- Updated to SQLite v3.45.0.
+
+**2023-12-29**: v3.44.2 (_20231229_)
+
+- Multi-arch support.
+- Version scheme was changed.
+
+**2023-12-08**: v3.44.2
+
+- Updated to SQLite v3.44.2.
+
+**2023-10-09**: v3.43.1
+
+- Updated to SQLite 3.43.1.
+
+**2023-08-28**: v3.43.0
+
+- Updated to SQLite 3.43.0.
+
+**2023-08-24**: v3.42.0
+
+- Updated to SQLite 3.42.0.
+- Version scheme was changed.
+
+**2022-11-17**: v3.40.0 (_v1.6_)
+
+- Updated to SQLite 3.40.0.
+
+**2021-07-26**: v3.36.0 (_v1.5_)
+
+- Updated to SQLite 3.36.0.
+
+**2021-04-25**: v3.35.5 (_v1.4_)
+
+- Updated to SQLite 3.35.5.
+- Updated for Magisk v20.4 template format.
+
+**2019-03-29**: v3.27.2 (_v1.3_)
+
+- Updated to SQLite 3.27.2.
+
+**2019-03-29**: v3.24.0 (_v1.2_)
+
+- Updated for Magisk v19 template format.
+
+**2018-07-22**: v3.24.0 (_v1.1_)
+
+- Now installed in `/system/bin` if `/system/xbin` unavailable.
+
+**2018-07-03**: v3.24.0 (_v1.0_)
+
+- Initial release.
+- SQLite 3.24.0.
diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
@@ -1,155 +1,33 @@
 #!/sbin/sh
-##########################################################################################
-#
-# Magisk Module Template Install Script
-# by topjohnwu
-#
-##########################################################################################
 
-# Detect whether in boot mode
-ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
-$BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true
+#################
+# Initialization
+#################
 
-TMPDIR=/dev/tmp
-INSTALLER=$TMPDIR/install
-MAGISKBIN=/data/adb/magisk
-
-# Default permissions
 umask 022
 
-# Initial cleanup
-rm -rf $TMPDIR 2>/dev/null
-mkdir -p $INSTALLER
-
 # echo before loading util_functions
 ui_print() { echo "$1"; }
 
 require_new_magisk() {
   ui_print "*******************************"
-  ui_print " Please install Magisk v15.0+! "
+  ui_print " Please install Magisk v20.4+! "
   ui_print "*******************************"
   exit 1
 }
 
-##########################################################################################
-# Environment
-##########################################################################################
+#########################
+# Load util_functions.sh
+#########################
 
 OUTFD=$2
-ZIP=$3
+ZIPFILE=$3
 
 mount /data 2>/dev/null
 
-# Utility functions must exist
-[ -f $MAGISKBIN/util_functions.sh ] || require_new_magisk
-# Load utility fuctions
-. $MAGISKBIN/util_functions.sh
-
-# We can't alter magisk image live, use alternative image if required
-$BOOTMODE && IMG=/data/adb/magisk_merge.img
-# Always mount under tmp
-MOUNTPATH=$TMPDIR/magisk_img
-
-# Preperation for flashable zips
-get_outfd
-
-# Mount partitions
-mount_partitions
-
-# Detect version and architecture
-api_level_arch_detect
-
-# You can get the Android API version from $API, the CPU architecture from $ARCH
-# Useful if you are creating Android version / platform dependent mods
-
-# Setup busybox and binaries
-$BOOTMODE && boot_actions || recovery_actions
-
-##########################################################################################
-# Preparation
-##########################################################################################
-
-# Extract common files
-unzip -o "$ZIP" module.prop config.sh 'common/*' -d $INSTALLER >&2
-
-[ ! -f $INSTALLER/config.sh ] && abort "! Unable to extract zip file!"
-# Load configurations
-. $INSTALLER/config.sh
-
-# Check the installed magisk version
-MIN_VER=`grep_prop minMagisk $INSTALLER/module.prop`
-[ ! -z $MAGISK_VER_CODE -a $MAGISK_VER_CODE -ge $MIN_VER ] || require_new_magisk
-MODID=`grep_prop id $INSTALLER/module.prop`
-MODPATH=$MOUNTPATH/$MODID
-
-# Print mod name
-print_modname
-
-# Please leave this message in your flashable zip for credits :)
-ui_print "******************************"
-ui_print "Powered by Magisk (@topjohnwu)"
-ui_print "******************************"
-
-##########################################################################################
-# Install
-##########################################################################################
-
-# Get the variable reqSizeM. Use your own method to determine reqSizeM if needed
-request_zip_size_check "$ZIP"
-
-# This function will mount $IMG to $MOUNTPATH, and resize the image based on $reqSizeM
-mount_magisk_img
-
-# Create mod paths
-rm -rf $MODPATH 2>/dev/null
-mkdir -p $MODPATH
-
-# Extract files to system. Use your own method if needed
-ui_print "- Extracting module files"
-unzip -o "$ZIP" 'system/*' -d $MODPATH >&2
-
-set_bindir
-
-# Remove placeholder
-rm -f $MODPATH/system/placeholder 2>/dev/null
-
-# Handle replace folders
-for TARGET in $REPLACE; do
-  mktouch $MODPATH$TARGET/.replace
-done
-
-# Auto Mount
-$AUTOMOUNT && touch $MODPATH/auto_mount
-
-# prop files
-$PROPFILE && cp -af $INSTALLER/common/system.prop $MODPATH/system.prop
-
-# Module info
-cp -af $INSTALLER/module.prop $MODPATH/module.prop
-if $BOOTMODE; then
-  # Update info for Magisk Manager
-  mktouch /sbin/.core/img/$MODID/update
-  cp -af $INSTALLER/module.prop /sbin/.core/img/$MODID/module.prop
-fi
-
-# post-fs-data mode scripts
-$POSTFSDATA && cp -af $INSTALLER/common/post-fs-data.sh $MODPATH/post-fs-data.sh
-
-# service mode scripts
-$LATESTARTSERVICE && cp -af $INSTALLER/common/service.sh $MODPATH/service.sh
-
-ui_print "- Setting permissions"
-set_permissions
-
-##########################################################################################
-# Finalizing
-##########################################################################################
-
-# Unmount magisk image and shrink if possible
-unmount_magisk_img
-
-$BOOTMODE || recovery_cleanup
-rm -rf $TMPDIR
+[ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk
+. /data/adb/magisk/util_functions.sh
+[ $MAGISK_VER_CODE -lt 20400 ] && require_new_magisk
 
-ui_print "- Done"
+install_module
 exit 0
diff --git a/Makefile b/Makefile
@@ -0,0 +1,25 @@
+ZIP_FILES := customize.sh META-INF module.prop system
+VERSION = v3.50.4
+VERSIONCODE = 20250807
+.PHONY: module.prop system/bin zip
+
+default: module.prop system/bin zip
+
+zip:
+	rm -f SQLite-$(VERSION)-for-magisk.multi-arch.zip
+	zip -9 -r SQLite-$(VERSION)-for-magisk.multi-arch.zip $(ZIP_FILES)
+
+module.prop:
+	sed -i 's/version=.*$$/version=$(VERSION)/' module.prop
+	sed -i 's/versionCode=.*$$/versionCode=$(VERSIONCODE)/' module.prop
+
+sqlite3-android:
+	make -C ../sqlite3-android clean
+	make -C ../sqlite3-android
+
+system/bin:
+	mkdir -p system/bin
+	cp ../sqlite3-android/libs/arm64-v8a/sqlite3-static	system/bin/sqlite3.arm64
+	cp ../sqlite3-android/libs/armeabi-v7a/sqlite3-static	system/bin/sqlite3.arm
+	cp ../sqlite3-android/libs/x86_64/sqlite3-static	system/bin/sqlite3.x64
+	cp ../sqlite3-android/libs/x86/sqlite3-static		system/bin/sqlite3.x86
diff --git a/README.md b/README.md
@@ -1,23 +1,30 @@
-# **SQLite3 for ARM aarch64**
+# SQLite3 for arm, arm64, x86 and x64
 
 ## Description
 
-This Magisk module provides a statically linked and stripped `sqlite3` binary for ARM aarch64 devices.
+This Magisk module provides a statically linked and stripped `sqlite3` binary for **arm64-v8a**, **armeabi-v7a**, **x86** and **x86_64** devices.
 
-## Changelog
+## Tested Devices
 
-2018-07-22: v1.1
+ - arm64-v8a:
+   - **Lenovo Tab M10 Plus Gen 3**
+   - **Xiaomi MI 6**
+   - **Samsung Galaxy S6 Edge**
+ - x86_64:
+   - **LDPlayer 9**
+   - **Waydroid**
+
+## Download
 
-- Now installed in `/system/bin` if `/system/xbin` unavailable.
+Releases: [SQLite-vX.XX.X-for-magisk.multi-arch.zip](https://github.com/rojenzaman/sqlite3-magisk-module/releases)
 
-2018-07-03: v1.0
+## Changelog
 
-- Initial release.
-- SQLite 3.24.0.
+Check: [CHANGELOG.md](CHANGELOG.md)
 
 ## Credits
 
-Thanks to @stockrt for the convenient SQLite [build scripts for Android](https://github.com/stockrt/sqlite3-android).
+Thanks to @jacopotediosi for the convenient SQLite [multi-arch build scripts for Android](https://github.com/jacopotediosi/sqlite3-android).
 
 ## Links
 [SQLite](https://www.sqlite.org/)
diff --git a/common/post-fs-data.sh b/common/post-fs-data.sh
diff --git a/common/service.sh b/common/service.sh
diff --git a/common/system.prop b/common/system.prop