Android and GDB fixes

Cargo.toml

@@ -47,6 +47,7 @@ members = [
   "crates/aot-data",
   "crates/aot-lib",
   "crates/cli",
+  "crates/cli-goodies",
   "crates/debugger",
   "crates/events",
   "crates/events-apigen",
@@ -85,6 +86,7 @@ exclude = [
 webrogue-aot-compiler = { path = "crates/aot-compiler", default-features=false }
 webrogue-aot-data = { path = "crates/aot-data" }
 webrogue-cli = { path = "crates/cli" }
+webrogue-cli-goodies = { path = "crates/cli-goodies" }
 webrogue-events = { path = "crates/events" }
 webrogue-events-macro = { path = "crates/events-macro" }
 webrogue-debugger = { path = "crates/debugger" }
@@ -142,7 +144,7 @@ rustix = { version = "1.0.8", default-features = false }
 cfg_aliases = { version = "0.2.1" }
 windows-sys = { version = "0.61.2", default-features = false }
 windows = { version = "0.62.2", default-features = false }
-wry = { version = "0.55", default-features = false }
+wry = { version = "0.54", default-features = false }
 tao = { version = "0.34.5", default-features = false }
 winit = { version = "0.31.0-beta.2", default-features = false }
 winit-android = { version = "0.31.0-beta.2", default-features = false }
@@ -180,7 +182,6 @@ wasm-bindgen-futures = "0.4"
 web-sys = "0.3.91"
 parking_lot = "0.12.5"
 getrandom = { version = "0.4.2", default-features = false }
-cap-rand = { version = "3.4.5", features = ["small_rng"] }
 reqwest = { version = "0.13" }
 zip-extract = { version = "0.4.1" }
 wasm_thread = { git = "https://github.com/webrogue-runtime/wasm_thread.git", rev = "daa98f6", default-features = false }
@@ -193,6 +194,7 @@ crossterm = "0.29"
 spinners = "4.2.0"
 headers = "0.4"
 axum-extra = { version = "0.12" }
+rustls = { version = "0.23", default-features = false }
 
 [profile.dev]
 panic = "abort"
@@ -219,10 +221,18 @@ strip = "debuginfo"
 inherits = "release"
 debug = true
 
+[profile.dev.package.hashbrown]
+opt-level = 3
+codegen-units = 1
+
 [profile.dev.package.cranelift-codegen]
 opt-level = 3
 codegen-units = 1
 
+[profile.dev.package.regalloc2]
+opt-level = 3
+codegen-units = 1
+
 [profile.dev.package.gimli]
 opt-level = 3
 codegen-units = 1

android/runtime/build_native_code.sh

@@ -17,8 +17,8 @@ rm -rf runner/src/main/jniLibs
 cargo install cargo-ndk
 
 # CARGO_TARGET_VAR="-C link-arg=-Wl,--no-allow-shlib-undefined -C link-arg=-Wl,--no-undefined"
-# export CARGO_TARGET_AARCH64_LINUX_ANDROID_RUSTFLAGS="$CARGO_TARGET_VAR" 
-# export CARGO_TARGET_X86_64_LINUX_ANDROID_RUSTFLAGS="$CARGO_TARGET_VAR" 
+# export CARGO_TARGET_AARCH64_LINUX_ANDROID_RUSTFLAGS="$CARGO_TARGET_VAR"
+# export CARGO_TARGET_X86_64_LINUX_ANDROID_RUSTFLAGS="$CARGO_TARGET_VAR"
 
 # rm -f ../process_dump/p.*
 # STRACE_COMMAND="strace -s 1000 -o ../process_dump/p -ff"

android/runtime/launcher/src/lib.rs

@@ -1,7 +1,3 @@
-use jni::{
-    objects::{JClass, JString},
-    JNIEnv,
-};
 use lazy_static::lazy_static;
 use std::{
     path::PathBuf,
@@ -12,9 +8,7 @@ use tao::{
     event_loop::{ControlFlow, EventLoop, EventLoopProxy, EventLoopWindowTarget},
     window::WindowBuilder,
 };
-use tokio::io::AsyncRead;
 use webrogue_launcher::{LauncherConfig, MailboxInternal};
-use webrogue_wrapp::RealVFSBuilder;
 use wry::WebView;
 
 #[cfg(target_os = "android")]
@@ -146,11 +140,12 @@ lazy_static! {
         Mutex::new(None);
 }
 
+#[cfg(target_os = "android")]
 #[no_mangle]
 unsafe extern "C" fn Java_dev_webrogue_launcher_DebugEventBroadcastReceiver_onData<'local>(
-    mut env: JNIEnv<'local>,
-    class: JClass<'local>,
-    data: JString,
+    mut env: jni::JNIEnv<'local>,
+    class: jni::objects::JClass<'local>,
+    data: jni::objects::JString,
 ) {
     let data = env.get_string(&data).unwrap().to_str().unwrap().to_owned();
     SDP_ANSWER_SENDER

crates/aot-compiler/Cargo.toml

@@ -22,3 +22,5 @@ wasmtime-environ = { workspace = true, default-features = false }
 postcard = { workspace = true, default-features = false, features = ['alloc'] }
 serde = { workspace = true, features = ['derive'] }
 zip = { workspace = true, default-features = false, features = ['deflate'] }
+webrogue-cli-goodies = { workspace = true }
+semver = { workspace = true, default-features = false }

crates/aot-compiler/src/android/gradle/icons.rs

@@ -1,11 +1,15 @@
+use webrogue_cli_goodies::step;
+
 pub fn build<VFSBuilder: webrogue_wrapp::IVFSBuilder>(
     build_dir: &std::path::Path,
     vfs_builder: &mut VFSBuilder,
     old_stamp: Option<&webrogue_icons::IconsData>,
 ) -> anyhow::Result<webrogue_icons::IconsData> {
     let new_stamp = webrogue_icons::IconsData::from_vfs_builder(vfs_builder)?;
     if old_stamp != Some(&new_stamp) {
-        webrogue_icons::android::generate_icons(build_dir, &new_stamp)?;
+        step("Generating icons".to_owned(), || {
+            webrogue_icons::android::generate_icons(build_dir, &new_stamp)
+        })?;
     }
     Ok(new_stamp)
 }