Don't add std dependency when building rlib. am: ab2400dbd9 am: e6427cd03c am: 4eab12190c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/2036445
Change-Id: I627c224477ec9cff2d50a804683eae1ed59053be
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/patches/std.diff b/patches/std.diff
index c2ccaee..a34fe97 100644
--- a/patches/std.diff
+++ b/patches/std.diff
@@ -1,15 +1,14 @@
diff --git a/src/lib.rs b/src/lib.rs
-index 935e432..36c0699 100644
+index 935e432..7e87795 100644
--- a/src/lib.rs
+++ b/src/lib.rs
-@@ -278,6 +278,10 @@
- #![cfg_attr(not(test), no_std)]
+@@ -275,7 +275,8 @@
+ //!
+ //! Users should generally avoid defining a flag with a value of zero.
+
+-#![cfg_attr(not(test), no_std)]
++// ANDROID: Use std to allow building as a dylib.
++#![cfg_attr(not(any(test, android_dylib)), no_std)]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.2")]
-+// ANDROID: Unconditionally use std to allow building as a dylib
-+#[macro_use]
-+extern crate std;
-+
#[doc(hidden)]
- pub extern crate core as _core;
-
diff --git a/src/lib.rs b/src/lib.rs
index 36c0699..7e87795 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -275,13 +275,10 @@
//!
//! Users should generally avoid defining a flag with a value of zero.
-#![cfg_attr(not(test), no_std)]
+// ANDROID: Use std to allow building as a dylib.
+#![cfg_attr(not(any(test, android_dylib)), no_std)]
#![doc(html_root_url = "https://docs.rs/bitflags/1.3.2")]
-// ANDROID: Unconditionally use std to allow building as a dylib
-#[macro_use]
-extern crate std;
-
#[doc(hidden)]
pub extern crate core as _core;
