feat: playing around with aw-sync on android and misc

Makefile

@@ -151,7 +151,8 @@ export ON_ANDROID := -- --android
 aw-server-rust: $(JNILIBS)
 
 .PHONY: $(JNILIBS)
-$(JNILIBS): $(JNI_arm7)/libaw_server.so $(JNI_arm8)/libaw_server.so $(JNI_x86)/libaw_server.so $(JNI_x64)/libaw_server.so
+$(JNILIBS): $(JNI_arm7)/libaw_server.so $(JNI_arm8)/libaw_server.so $(JNI_x86)/libaw_server.so $(JNI_x64)/libaw_server.so \
+            $(JNI_arm7)/libaw_sync.so $(JNI_arm8)/libaw_sync.so $(JNI_x86)/libaw_sync.so $(JNI_x64)/libaw_sync.so
 	@ls -lL $@/*/*  # Check that symlinks are valid
 
 # There must be a better way to do this without repeating almost the same rule over and over?
@@ -170,6 +171,20 @@ $(JNI_x64)/libaw_server.so: $(TARGETDIR_x64)/$(RELEASE_TYPE)/libaw_server.so
 	mkdir -p $$(dirname $@)
 	if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86_64" ]; then ln -fnv $$(pwd)/$^ $@; fi
 
+$(JNI_arm7)/libaw_sync.so: $(TARGETDIR_arm7)/$(RELEASE_TYPE)/libaw_sync.so
+	mkdir -p $$(dirname $@)
+	# if target is empty, then create symlink
+	if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "arm" ]; then ln -fnv $$(pwd)/$^ $@; fi
+$(JNI_arm8)/libaw_sync.so: $(TARGETDIR_arm8)/$(RELEASE_TYPE)/libaw_sync.so
+	mkdir -p $$(dirname $@)
+	if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "arm64" ]; then ln -fnv $$(pwd)/$^ $@; fi
+$(JNI_x86)/libaw_sync.so: $(TARGETDIR_x86)/$(RELEASE_TYPE)/libaw_sync.so
+	mkdir -p $$(dirname $@)
+	if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86" ]; then ln -fnv $$(pwd)/$^ $@; fi
+$(JNI_x64)/libaw_sync.so: $(TARGETDIR_x64)/$(RELEASE_TYPE)/libaw_sync.so
+	mkdir -p $$(dirname $@)
+	if [ -z "$(TARGET)" ] || [ "$(TARGET)" == "x86_64" ]; then ln -fnv $$(pwd)/$^ $@; fi
+
 RUSTFLAGS_ANDROID="-C debuginfo=2 -Awarnings"
 # Explanation of RUSTFLAGS:
 #  `-Awarnings` allows all warnings, for cleaner output (warnings should be detected in aw-server-rust CI anyway)
@@ -192,6 +207,17 @@ $(RS_SRCDIR)/target/%/$(RELEASE_TYPE)/libaw_server.so: $(RS_SOURCES) $(WEBUI_DIS
 		env RUSTFLAGS=$(RUSTFLAGS_ANDROID) make -C aw-server-rust android; \
 	fi
 
+# Same rule for libaw_sync.so (but without webui dependency)
+$(RS_SRCDIR)/target/%/$(RELEASE_TYPE)/libaw_sync.so: $(RS_SOURCES)
+	@echo $@
+	@echo "Release type: $(RELEASE_TYPE)"
+	@if [ "$$USE_PREBUILT" == "true" ] && [ -f $@ ]; then \
+		echo "Using prebuilt libaw_sync.so"; \
+	else \
+		echo "Building libaw_sync.so from aw-server-rust repo"; \
+		env RUSTFLAGS=$(RUSTFLAGS_ANDROID) make -C aw-server-rust android; \
+	fi
+
 # aw-webui
 .PHONY: $(WEBUI_DISTDIR)
 $(WEBUI_DISTDIR):
@@ -210,4 +236,4 @@ clean:
 
 .PHONY: fastlane/metadata/android/en-US/images/icon.png
 fastlane/metadata/android/en-US/images/icon.png: aw-server-rust/aw-webui/media/logo/logo.png
-	convert $< -resize 75% -gravity center -background white -extent 512x512 $@
+	magick $< -resize 75% -gravity center -background white -extent 512x512 $@

README.md

@@ -38,7 +38,7 @@ If you haven't already, initialize the submodules with: `git submodule update --
 
 To build aw-server-rust you need to have Rust nightly installed (with rustup). Then you can build it with:
 
-```
+```sh
 export ANDROID_NDK_HOME=`pwd`/aw-server-rust/NDK  # The path to your NDK
 pushd aw-server-rust && ./install-ndk.sh; popd    # This configures the NDK for use with Rust, and installs the NDK if missing
 env RELEASE=false make aw-server-rust             # Set RELEASE=true to build in release mode (slower build, harder to debug)

build.gradle

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
-    ext.androidXTestVersion = '1.5.0'
-    ext.espressoVersion = '3.5.0'
-    ext.extJUnitVersion = '1.1.4'
+    ext.kotlin_version = '1.9.0'
+    ext.androidXTestVersion = '1.7.0'
+    ext.espressoVersion = '3.7.0'
+    ext.extJUnitVersion = '1.3.0'
     ext.servicesVersion = '1.4.2'
     repositories {
         google()
@@ -14,7 +14,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'
 

gradle.properties

@@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
 kotlin.code.style=official
 android.useAndroidX=true
 android.enableJetifier=true
+
+# Enable native symbol preservation for debugging
+# doNotStrip=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
+#Fri Sep 26 14:49:59 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists