Support building all variants.

Bug: 143217452
Test: cd external/rust; mma; atest in all TEST_MAPPING subdirs
Change-Id: I6dae7032877e725edc4567fd6ccf13c26b6c5a73

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;