Skip to content

Commit 3951beb

Browse files
committed
Rename feature gate android_log to android-ndk
1 parent 5272671 commit 3951beb

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ jobs:
232232
run: cargo install cross --git https://github.com/cross-rs/cross --verbose
233233
- name: Build example
234234
run: |
235-
cross build --target x86_64-linux-android --example native_android --features native,android_log,source-location --verbose
235+
cross build --target x86_64-linux-android --example native_android --features native,android-ndk,source-location --verbose
236236
mv ./target/x86_64-linux-android/debug/examples/native_android ./target/x86_64-linux-android/debug/examples/native_android_srcloc
237-
cross build --target x86_64-linux-android --example native_android --features native,android_log --verbose
237+
cross build --target x86_64-linux-android --example native_android --features native,android-ndk --verbose
238238
- name: Enable KVM
239239
run: |
240240
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

spdlog/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ release-level-trace = []
3535
source-location = []
3636
native = []
3737
libsystemd = ["dep:libsystemd-sys"]
38-
android_log = ["dep:android_log-sys"]
38+
android-ndk = ["dep:android_log-sys"]
3939
multi-thread = ["dep:crossbeam"]
4040
runtime-pattern = ["dep:spdlog-internal"]
4141
serde = ["dep:serde", "value-bag/serde"]
@@ -180,4 +180,4 @@ required-features = ["multi-thread"]
180180
[[example]]
181181
name = "native_android"
182182
path = "examples/native/android.rs"
183-
required-features = ["native", "android_log"]
183+
required-features = ["native", "android_ndk"]

spdlog/src/formatter/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
//! [./examples]: https://github.com/SpriteOvO/spdlog-rs/tree/main/spdlog/examples
5353
5454
#[cfg(any(
55-
all(target_os = "android", feature = "native", feature = "android_log"),
55+
all(target_os = "android", feature = "native", feature = "android-ndk"),
5656
all(doc, not(doctest))
5757
))]
5858
mod android_formatter;
@@ -71,7 +71,7 @@ mod unreachable_formatter;
7171
use std::ops::Range;
7272

7373
#[cfg(any(
74-
all(target_os = "android", feature = "native", feature = "android_log"),
74+
all(target_os = "android", feature = "native", feature = "android-ndk"),
7575
all(doc, not(doctest))
7676
))]
7777
pub(crate) use android_formatter::*;

spdlog/src/sink/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! [`Logger`]: crate::logger::Logger
2121
2222
#[cfg(any(
23-
all(target_os = "android", feature = "native", feature = "android_log"),
23+
all(target_os = "android", feature = "native", feature = "android-ndk"),
2424
all(doc, not(doctest))
2525
))]
2626
mod android_sink;
@@ -42,7 +42,7 @@ mod write_sink;
4242
use std::ops::Deref;
4343

4444
#[cfg(any(
45-
all(target_os = "android", feature = "native", feature = "android_log"),
45+
all(target_os = "android", feature = "native", feature = "android-ndk"),
4646
all(doc, not(doctest))
4747
))]
4848
pub use android_sink::*;

0 commit comments

Comments
 (0)