From 0cd452f782ded36e59c581529639b35ce523898f Mon Sep 17 00:00:00 2001 From: Jakub Witczak Date: Thu, 31 Oct 2024 12:57:26 +0100 Subject: [PATCH] Revert panic abort (#53) --- .github/workflows/release-kotlin.yml | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-kotlin.yml b/.github/workflows/release-kotlin.yml index df4738d..c28c7c2 100644 --- a/.github/workflows/release-kotlin.yml +++ b/.github/workflows/release-kotlin.yml @@ -29,7 +29,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: stable target: ${{ matrix.target }} override: true components: rust-src @@ -53,12 +53,12 @@ jobs: - name: Build Rust library run: | - RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" cargo +nightly ndk -t ${{ matrix.target }} build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --release --features=uniffi/cli - + cargo ndk -t ${{ matrix.target }} build --release --features=uniffi/cli + - name: Generate Kotlin bindings (once) if: ${{ matrix.target == 'aarch64-linux-android' }} run: | - cargo +nightly run --features=uniffi/cli --bin uniffi-bindgen generate --library target/${{ matrix.target }}/release/libuniffi_yttrium.so --language kotlin --out-dir yttrium/kotlin-bindings + cargo run --features=uniffi/cli --bin uniffi-bindgen generate --library target/${{ matrix.target }}/release/libuniffi_yttrium.so --language kotlin --out-dir yttrium/kotlin-bindings - name: Prepare artifacts run: | diff --git a/Cargo.toml b/Cargo.toml index 4c32607..598019b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ log = "0.4.20" opt-level = 'z' lto = true codegen-units = 1 -panic = "abort" +# panic = "abort" # strip = true - it removes kotlin-bindings