Skip to content

Commit

Permalink
ndk-sys: Drop cfg for inexistant target_arch = "armv7"
Browse files Browse the repository at this point in the history
[Rust nightly since May 6 2024] points out that `armv7` is not a known,
valid value for the `target_arch` cfg variable.  This is confirmed by
the docs not listing it either:
https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch

Hence drop this entirely, and rely purely on `target_arch = "arm"`.

[Rust nightly since May 6 2024]: https://blog.rust-lang.org/2024/05/06/check-cfg.html
  • Loading branch information
MarijnS95 committed May 14, 2024
1 parent ce3d82f commit 16f9ae0
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions ndk-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ use jni_sys::*;
#[cfg(not(any(target_os = "android", feature = "test")))]
compile_error!("ndk-sys only supports compiling for Android");

#[cfg(all(
any(target_os = "android", feature = "test"),
any(target_arch = "arm", target_arch = "armv7")
))]
#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "arm"))]
include!("ffi_arm.rs");

#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "aarch64"))]
Expand Down

0 comments on commit 16f9ae0

Please sign in to comment.