Share the platform-neutral Rust mobile contract (#91)

android/rust-bridge/build.gradle.kts

@@ -46,6 +46,9 @@ val cargoExecutable = providers.environmentVariable("CARGO").orElse(
     }
 )
 val rustVersion = libs.versions.rust.get()
+val rustcExecutable = providers.exec {
+    commandLine("rustup", "which", "--toolchain", rustVersion, "rustc")
+}.standardOutput.asText.map { it.trim() }
 val ndkDirectory = androidComponents.sdkComponents.ndkDirectory
 val sdkDirectory = androidComponents.sdkComponents.sdkDirectory
 val rustInputs = files(
@@ -79,6 +82,8 @@ androidComponents.onVariants { variant ->
         inputs.property("ndkVersion", libs.versions.ndk.get())
         inputs.property("minSdk", libs.versions.minSdk.get())
         outputs.dir(rawNative)
+        environment("RUSTUP_TOOLCHAIN", rustVersion)
+        environment("RUSTC", rustcExecutable.get())
         environment("ANDROID_NDK_HOME", ndkDirectory.get().asFile.absolutePath)
         environment("ANDROID_HOME", sdkDirectory.get().asFile.absolutePath)
         environment(
@@ -128,16 +133,10 @@ androidComponents.onVariants { variant ->
         outputs.dir(rawBindings)
         commandLine(
             cargoExecutable.get(), "+$rustVersion", "run", "--locked",
-            "--package", "ironstorage-android-build", "--bin", "ironstorage-uniffi-bindgen",
-            "--", "generate", "--library",
-            nativeOutput.get().file(
-                "arm64-v8a/libironstorage_android.so"
-            ).asFile.absolutePath,
-            "--language", "kotlin", "--config",
-            rootProject.file(
-                "uniffi.toml"
-            ).absolutePath,
-            "--out-dir", rawBindings.get().asFile.absolutePath, "--no-format"
+            "--package", "ironstorage-android-build", "--", "contract-bindings",
+            nativeOutput.get().file("arm64-v8a/libironstorage_android.so").asFile.absolutePath,
+            rootProject.file("uniffi.toml").absolutePath,
+            rawBindings.get().asFile.absolutePath, "phone"
         )
     }
     val prepare = tasks.register<Exec>("prepare${title}RustBindings") {
@@ -153,7 +152,7 @@ androidComponents.onVariants { variant ->
         commandLine(
             cargoExecutable.get(), "+$rustVersion", "run", "--locked",
             "--package", "ironstorage-android-build", "--", "prepare-bindings",
-            rawBindings.get().asFile.absolutePath, bindings.get().asFile.absolutePath
+            rawBindings.get().dir("kotlin").asFile.absolutePath, bindings.get().asFile.absolutePath
         )
     }
     variant.sources.kotlin!!.addStaticSourceDirectory(bindings.get().asFile.absolutePath)
@@ -162,3 +161,8 @@ androidComponents.onVariants { variant ->
         it.name == "pre${title}Build" || it.name == "compile${title}Kotlin"
     }.configureEach { dependsOn(prepare) }
 }
+
+// Instrumentation suites share persistent emulators and must not compete for input focus.
+tasks.matching { it.name == "connectedDebugAndroidTest" }.configureEach {
+    mustRunAfter(":app:connectedDebugAndroidTest")
+}