Support building all variants. am: 27022a622d am: 877ecd6a34 am: 7f8fe6e1f8 am: fcdc5eed36 am: a88b7cbe2a

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1356188

Change-Id: I39abbe0599c7f1699d7e625b643ed4e3119e5d93

2 files changed, 4 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 6cae518..48a1986 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: "libpin_project",
     host_supported: true,
     crate_name: "pin_project",
diff --git a/src/lib.rs b/src/lib.rs
index 42005cc..b1543e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,6 +45,9 @@
 #![allow(clippy::mem_replace_with_default, clippy::manual_non_exhaustive)]
 #![allow(clippy::needless_doctest_main)]
 
+// ANDROID: Use std to allow building as a dylib.
+extern crate std;
+
 #[doc(inline)]
 pub use pin_project_internal::pin_project;