| commit | f8b889099c4c0adfb0c934dc64be93e3e879cf65 | [log] [tgz] |
|---|---|---|
| author | Matthew Maurer <mmaurer@google.com> | Tue Jul 07 00:50:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 07 00:50:54 2020 +0000 |
| tree | 97928db879f162437ed7f3bc61d6ee88bacf5683 | |
| parent | 8cedc88b1ac28b438fa514ee5b601f8da77f7d11 [diff] | |
| parent | 6f6e8c65f8f7ff3bddbc3d1be06fd89dae8cf1df [diff] |
Support building all variants. am: 541fa02953 am: 6f6e8c65f8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/1356123 Change-Id: Ia3d911875a16edf820486810b328add8f629f2d1
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;