| commit | 1c2fe0734ee47c3a40b4885f81ffb971bb2befc8 | [log] [tgz] |
|---|---|---|
| author | Matthew Maurer <mmaurer@google.com> | Tue Jul 07 02:05:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 07 02:05:19 2020 +0000 |
| tree | 97928db879f162437ed7f3bc61d6ee88bacf5683 | |
| parent | e36fb8cb48c013e49086ce568985ef17579d231a [diff] | |
| parent | b6c5bb634dfceba899533b6c7b11f65a7e9c45e6 [diff] |
Support building all variants. am: 541fa02953 am: 6f6e8c65f8 am: f8b889099c am: a2a4976d31 am: b6c5bb634d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/1356123 Change-Id: I22f105142293c296e047130919b88110f7b4b2b5
diff --git a/Android.bp b/Android.bp index f1cb8a1..d75dab1 100644 --- a/Android.bp +++ b/Android.bp
@@ -1,6 +1,6 @@ // This file is generated by cargo2android.py --run --device. -rust_library_rlib { +rust_library { name: "libbitflags", host_supported: true, crate_name: "bitflags",
diff --git a/src/lib.rs b/src/lib.rs index 3929b02..7b01db0 100644 --- a/src/lib.rs +++ b/src/lib.rs
@@ -253,7 +253,7 @@ #![no_std] #![doc(html_root_url = "https://docs.rs/bitflags/1.2.1")] -#[cfg(test)] +// ANDROID: Unconditionally use std to allow building as a dylib #[macro_use] extern crate std;