kotlin(d2+d3): move android natives to AAR module + wire android-smoke

D2 — Android native staging path moves from
  kotlin/lib/src/main/resources/lib/<abi>/   (JVM JAR's lib/<abi>/)
to
  kotlin/android/src/main/jniLibs/<abi>/      (AAR source set; AGP
                                              packages into the AAR's
                                              jni/<abi>/, then merged
                                              into consumer APKs).
Updated:
  - cargo make kotlin-android task (writes to jniLibs path).
  - release.yml stage-natives step (writes both JVM resources + AAR
    jniLibs from the cdylib + android-jniLibs artifacts).
  - ci_kotlin.yml kotlin-android-consumer-smoke job (same).
  - verify-kotlin-artifact (validates both source trees instead of
    just kotlin/lib/src/main/resources).
  - publish step: ./gradlew publishAndReleaseToMavenCentral now (no
    :lib: prefix) so both subprojects publish.
  - .gitignore: kotlin/android/src/main/jniLibs/ is CI-generated.

D3 — kotlin/android-smoke consumes the new AAR coordinate. Composite
build substitutes computer.iroh:iroh-android → :android (was iroh →
:lib). app/build.gradle.kts depends on iroh-android (which transitively
brings in :lib + JNA AAR correctly).

Also: make :android subproject conditionally included (skip on hosts
without an Android SDK, e.g. the self-hosted linux-aarch64 runner
where setup-android@v3 fails). Lets :lib build + test on that runner
without the SDK. JVM smoke + JVM test jobs skip setup-android on
linux-aarch64.

Author: dignifiedquire

.github/workflows/ci_kotlin.yml

@@ -41,10 +41,12 @@ jobs:
           distribution: "temurin"
           java-version: "21"
       - uses: gradle/actions/setup-gradle@v4
-      # AGP requires the Android SDK at configuration time. Even though
-      # test-kotlin only runs :lib:test, Gradle still has to configure the
-      # :android subproject in the same kotlin/ root build.
+      # AGP requires the Android SDK at configuration time. Skip on
+      # linux-aarch64 (setup-android@v3 fails on that runner) — the :android
+      # subproject is conditionally excluded by settings.gradle.kts when no
+      # SDK is detected, so :lib still builds + tests fine without it.
       - uses: android-actions/setup-android@v3
+        if: matrix.name != 'linux-aarch64'
       - name: cargo make test-kotlin
         run: cargo make test-kotlin
 
@@ -120,10 +122,12 @@ jobs:
           distribution: "temurin"
           java-version: "21"
       - uses: gradle/actions/setup-gradle@v4
-      # AGP requires the Android SDK at configuration time; even though this
-      # job only runs :lib:test, Gradle still configures the :android
-      # subproject in the same root build.
+      # AGP requires the Android SDK at configuration time. Skip on
+      # linux-aarch64 (setup-android@v3 fails on that runner) — the :android
+      # subproject is conditionally excluded by settings.gradle.kts when no
+      # SDK is detected, so :lib still builds + tests fine without it.
       - uses: android-actions/setup-android@v3
+        if: matrix.name != 'linux-aarch64'
       - name: cargo make verify-kotlin-consumer
         run: cargo make verify-kotlin-consumer
 
@@ -194,16 +198,16 @@ jobs:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           set -eu
-          # Stage at lib/<abi>/ — where AGP's mergeNativeLibsTask scans JAR
-          # deps to pull natives into a consumer APK.
+          # Stage at kotlin/android/src/main/jniLibs/<abi>/ — AAR source-set
+          # path, AGP packages these into the AAR's jni/<abi>/.
           cargo ndk -o ./_android_libs \
             -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 \
             build --release --lib -p iroh-ffi
-          RES=kotlin/lib/src/main/resources
+          JNI=kotlin/android/src/main/jniLibs
           for abi in armeabi-v7a arm64-v8a x86 x86_64; do
-            install -D -m644 "./_android_libs/$abi/libiroh_ffi.so" "$RES/lib/$abi/libiroh_ffi.so"
+            install -D -m644 "./_android_libs/$abi/libiroh_ffi.so" "$JNI/$abi/libiroh_ffi.so"
           done
-          # Composite-build :lib:jar needs the bindings file.
+          # Composite-build :android:assemble needs iroh_ffi.kt for :lib.
           cargo make bindgen-kotlin
       - name: Enable KVM
         run: |

.github/workflows/release.yml

@@ -252,11 +252,13 @@ permissions:
       - name: Stage Android natives + generate Kotlin bindings
         run: |
           set -eu
-          RES=kotlin/lib/src/main/resources
+          # AAR source-set path — AGP packages files here into the AAR's
+          # jni/<abi>/, which consumers' APKs then merge.
+          JNI=kotlin/android/src/main/jniLibs
           for abi in armeabi-v7a arm64-v8a x86 x86_64; do
-            install -D -m644 "android-jniLibs/$abi/libiroh_ffi.so" "$RES/lib/$abi/libiroh_ffi.so"
+            install -D -m644 "android-jniLibs/$abi/libiroh_ffi.so" "$JNI/$abi/libiroh_ffi.so"
           done
-          # Composite-build `:lib:jar` from android-smoke needs iroh_ffi.kt.
+          # Composite-build :android:assemble needs iroh_ffi.kt for :lib.
           cargo make bindgen-kotlin
       - name: Enable KVM
         # reactivecircus/android-emulator-runner needs HW accel on
@@ -311,26 +313,28 @@ permissions:
         with:
           name: kotlin-android-jniLibs
           path: android-jniLibs/
-      - name: Stage cdylibs under jna-platform dirs
+      - name: Stage natives into both module trees
         shell: bash
         run: |
           set -eu
+          # :lib (JVM JAR) — desktop cdylibs at JNA-platform paths.
           RES=kotlin/lib/src/main/resources
           rm -f "$RES"/libiroh_ffi.so "$RES"/libiroh_ffi.dylib "$RES"/iroh_ffi.dll
           install -D -m644 cdylibs/kotlin-cdylib-linux-x86_64/libiroh_ffi.so   "$RES/linux-x86-64/libiroh_ffi.so"
           install -D -m644 cdylibs/kotlin-cdylib-linux-aarch64/libiroh_ffi.so  "$RES/linux-aarch64/libiroh_ffi.so"
           install -D -m644 cdylibs/kotlin-cdylib-macos-aarch64/libiroh_ffi.dylib "$RES/darwin-aarch64/libiroh_ffi.dylib"
           install -D -m644 cdylibs/kotlin-cdylib-windows-x86_64/iroh_ffi.dll   "$RES/win32-x86-64/iroh_ffi.dll"
-          # Android ABIs: cargo-ndk emits <abi>/libiroh_ffi.so; ship them at
-          # lib/<abi>/ so AGP packages them into consumer APKs.
+          # :android (AAR) — per-ABI .so under jniLibs/, AGP packages these
+          # into the AAR's jni/<abi>/ which consumer APKs then merge.
+          JNI=kotlin/android/src/main/jniLibs
           for abi in armeabi-v7a arm64-v8a x86 x86_64; do
-            install -D -m644 "android-jniLibs/$abi/libiroh_ffi.so" "$RES/lib/$abi/libiroh_ffi.so"
+            install -D -m644 "android-jniLibs/$abi/libiroh_ffi.so" "$JNI/$abi/libiroh_ffi.so"
           done
-          find "$RES" -type f
+          find "$RES" "$JNI" -type f
       - name: Verify Kotlin artifact contents
         # Gate publish on every required native lib being present at the
         # right path with the right architecture (catches iroh-ffi#246-class
-        # bugs — jar uploaded missing a platform slice, app crashes at
+        # bugs — artifact uploaded missing a platform slice, app crashes at
         # runtime with UnsatisfiedLinkError).
         run: cargo make verify-kotlin-artifact
       - name: Publish to Maven Central
@@ -339,5 +343,9 @@ permissions:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
-        run: ./gradlew :lib:publishAndReleaseToMavenCentral --no-daemon --console=plain
+        # Both modules in one Vanniktech invocation — :lib publishes
+        # computer.iroh:iroh (JAR), :android publishes computer.iroh:iroh-
+        # android (AAR). Each subproject's mavenPublishing block configures
+        # its own coordinates + publication shape.
+        run: ./gradlew publishAndReleaseToMavenCentral --no-daemon --console=plain
 

.gitignore

@@ -108,6 +108,10 @@ package-lock.json
 
 kotlin/*.jar
 kotlin/**/*.dylib
+# Android native libs are CI-staged (release.yml / kotlin-android job); the
+# AAR build pulls them into the publication but the .so files themselves are
+# generated artifacts, not source.
+kotlin/android/src/main/jniLibs/
 
 # Transient xcodebuild derived data for the Swift test task
 /.xcode-ddata

Makefile.toml

@@ -165,7 +165,7 @@ command -v cargo-ndk >/dev/null 2>&1 || cargo install --version 3.5.4 cargo-ndk
 # Host lib only needed so uniffi-bindgen can read metadata.
 cargo build --lib
 TARGET_DIR=$(cargo metadata --format-version 1 --no-deps | python3 -c 'import json,sys;print(json.load(sys.stdin)["target_directory"])')
-cargo ndk -o ./kotlin/lib/src/main/jniLibs \
+cargo ndk -o ./kotlin/android/src/main/jniLibs \
   --manifest-path ./Cargo.toml \
   -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 \
   build --release
@@ -265,42 +265,48 @@ echo "verify-swift-xcframework: OK"
 '''
 
 [tasks.verify-kotlin-artifact]
-description = "Verify kotlin/lib/src/main/resources/ has every required native lib (4 desktop JNA paths + 4 Android ABIs under lib/) with the correct architecture, before Maven publish."
+description = "Verify the two Kotlin artifact source trees have every required native lib with the correct architecture, before Maven publish. JVM JAR: 4 desktop JNA paths under kotlin/lib/src/main/resources/. AAR: 4 Android ABIs under kotlin/android/src/main/jniLibs/."
 script_runner = "@shell"
 script = '''
 set -eu
-RES="${IROH_KOTLIN_RES:-kotlin/lib/src/main/resources}"
-[ -d "$RES" ] || { echo "ERROR: $RES not found" >&2; exit 1; }
 
 fail=0
 err() { printf 'FAIL: %s\n' "$*" >&2; fail=1; }
 
-# JNA-platform paths (loaded by JNA from classpath at runtime) + lib/<abi>/
-# paths (merged into APKs by AGP from JAR dependencies). Patterns are file(1)
-# substring regexes; distinguish 32/64-bit, ARM-vs-x86, and Mach-O/PE/ELF.
+# Two source trees, one per published artifact:
+#   - kotlin/lib/src/main/resources/<jna-platform>/<lib>  → JVM JAR; JNA
+#     discovers libs at <jna-platform>/<libname>.<ext> from classpath.
+#   - kotlin/android/src/main/jniLibs/<abi>/libiroh_ffi.so → AAR; AGP packages
+#     these into consumer APKs at lib/<abi>/.
+# Patterns are file(1) substring regexes — distinguish 32/64-bit, ARM/x86,
+# Mach-O/PE/ELF.
+JVM_RES="${IROH_KOTLIN_RES:-kotlin/lib/src/main/resources}"
+AND_JNI="${IROH_KOTLIN_JNI:-kotlin/android/src/main/jniLibs}"
+[ -d "$JVM_RES" ] || { echo "ERROR: $JVM_RES not found" >&2; exit 1; }
+[ -d "$AND_JNI" ] || { echo "ERROR: $AND_JNI not found" >&2; exit 1; }
+
 SPECS="
-linux-x86-64/libiroh_ffi.so|ELF 64-bit.*x86-64
-linux-aarch64/libiroh_ffi.so|ELF 64-bit.*aarch64
-darwin-aarch64/libiroh_ffi.dylib|Mach-O 64-bit.*arm64
-win32-x86-64/iroh_ffi.dll|PE32\\+.*x86-64
-lib/armeabi-v7a/libiroh_ffi.so|ELF 32-bit.*ARM, EABI
-lib/arm64-v8a/libiroh_ffi.so|ELF 64-bit.*aarch64
-lib/x86/libiroh_ffi.so|ELF 32-bit.*Intel 80386
-lib/x86_64/libiroh_ffi.so|ELF 64-bit.*x86-64
+$JVM_RES/linux-x86-64/libiroh_ffi.so|ELF 64-bit.*x86-64
+$JVM_RES/linux-aarch64/libiroh_ffi.so|ELF 64-bit.*aarch64
+$JVM_RES/darwin-aarch64/libiroh_ffi.dylib|Mach-O 64-bit.*arm64
+$JVM_RES/win32-x86-64/iroh_ffi.dll|PE32\\+.*x86-64
+$AND_JNI/armeabi-v7a/libiroh_ffi.so|ELF 32-bit.*ARM, EABI
+$AND_JNI/arm64-v8a/libiroh_ffi.so|ELF 64-bit.*aarch64
+$AND_JNI/x86/libiroh_ffi.so|ELF 32-bit.*Intel 80386
+$AND_JNI/x86_64/libiroh_ffi.so|ELF 64-bit.*x86-64
 "
 
 while IFS='|' read -r path pat; do
   [ -n "$path" ] || continue
-  full="$RES/$path"
-  if [ ! -f "$full" ]; then
+  if [ ! -f "$path" ]; then
     err "missing $path"
     continue
   fi
-  desc=$(file -b "$full")
+  desc=$(file -b "$path")
   if ! printf '%s' "$desc" | grep -Eq "$pat"; then
     err "$path: arch mismatch (want /$pat/, got: $desc)"
   else
-    printf '  ok %-40s %s\n' "$path" "$desc"
+    printf '  ok %-60s %s\n' "$path" "$desc"
   fi
 done <<EOF
 $SPECS

kotlin/android-smoke/app/build.gradle.kts

@@ -31,15 +31,12 @@ android {
 }
 
 dependencies {
-    // The artifact under test. Exclude its JNA transitive — kotlin/lib
-    // declares net.java.dev.jna:jna:5.15.0 (the JAR variant, fine for JVM
-    // consumers), but Android needs the AAR variant which ships
-    // libjnidispatch.so for each ABI. AGP errors on the duplicate-class
-    // collision if both flavors hit the classpath.
-    implementation("computer.iroh:iroh:$irohVersion") {
-        exclude(group = "net.java.dev.jna", module = "jna")
-    }
-    implementation("net.java.dev.jna:jna:5.15.0@aar")
+    // The artifact under test. Android consumers depend on iroh-android (the
+    // AAR), which already handles the JNA AAR-vs-JAR exclusion internally —
+    // the transitive computer.iroh:iroh (the JVM JAR) is what carries the
+    // Kotlin API surface, and iroh-android adds IrohAndroid + the per-ABI
+    // libiroh_ffi.so files at jni/<abi>/.
+    implementation("computer.iroh:iroh-android:$irohVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
 
     androidTestImplementation("androidx.test.ext:junit:1.2.1")

kotlin/android-smoke/settings.gradle.kts

@@ -27,7 +27,10 @@ dependencyResolutionManagement {
 
 includeBuild("..") {
     dependencySubstitution {
-        substitute(module("computer.iroh:iroh")).using(project(":lib"))
+        // Android consumers depend on computer.iroh:iroh-android (the AAR);
+        // computer.iroh:iroh is the JVM-only JAR sibling, not what gets
+        // pulled into APKs.
+        substitute(module("computer.iroh:iroh-android")).using(project(":android"))
     }
 }
 

kotlin/settings.gradle.kts

@@ -24,4 +24,19 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "iroh-kotlin"
-include("lib", "android")
+include("lib")
+
+// `:android` requires an Android SDK at Gradle configuration time. On hosts
+// without one (e.g. the self-hosted linux-aarch64 runner where
+// android-actions/setup-android fails), skip the subproject so the rest of
+// the build still works. Jobs that need :android (publish, Android consumer
+// smoke) run setup-android before invoking Gradle.
+val androidSdkAvailable = listOf(
+    System.getenv("ANDROID_HOME"),
+    System.getenv("ANDROID_SDK_ROOT"),
+).any { !it.isNullOrEmpty() } || file("local.properties").exists()
+if (androidSdkAvailable) {
+    include("android")
+} else {
+    logger.lifecycle("[settings] No Android SDK detected (ANDROID_HOME / ANDROID_SDK_ROOT unset, no local.properties) — skipping :android subproject")
+}