diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index c23c74361..65dc26f7d 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -143,8 +143,9 @@ corrosion_import_crate( MANIFEST_PATH ../rust/Cargo.toml LOCKED FEATURES $,android-26,android> - FLAGS $<$>:-Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort> + FLAGS $<$>:-Z build-std=std,panic_abort -Z build-std-features=> ) +corrosion_add_target_rustflags(ehviewer_rust $<$>:-Z unstable-options -C panic=immediate-abort>) corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux) # Build and link our app's native lib diff --git a/rust-toolchain.toml b/rust-toolchain.toml index fb5d6858f..954fc037d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2025-09-23" +channel = "nightly-2025-10-03" components = ["rustfmt", "clippy", "rust-src"] targets = ["aarch64-linux-android", "x86_64-linux-android"] profile = "minimal"