Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix android compilation #64

Merged
merged 3 commits into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,29 @@ jobs:
- name: cargo test
run: cargo test

build-android:
name: Build sources
runs-on: ubuntu-22.04
strategy:
matrix:
job:
- { target: aarch64-unknown-linux-gnu }
- { target: aarch64-unknown-linux-musl }
- { target: aarch64-linux-android }
steps:
- uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
target: ${{ matrix.job.target }}
- uses: Swatinem/rust-cache@v2
- name: Build
uses: actions-rs/cargo@v1
with:
command: build
use-cross: true
args: --target ${{ matrix.job.target }} --verbose --all-targets

deny-check:
name: cargo-deny
runs-on: ubuntu-22.04
Expand Down
10 changes: 4 additions & 6 deletions crash-handler/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ pub use crash_context::CrashContext;
pub enum CrashEventResult {
/// The event was handled in some way
Handled(bool),
#[cfg(all(
not(target_os = "macos"),
any(
target_os = "linux",
all(target_os = "windows", target_arch = "x86_64")
)
#[cfg(any(
target_os = "linux",
target_os = "android",
all(target_os = "windows", target_arch = "x86_64"),
))]
/// The handler wishes to jump somewhere else, presumably to return
/// execution and skip the code that caused the exception
Expand Down