aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2020-07-07 00:35:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-07 00:35:16 +0000
commit877ecd6a34c5af7d0b1661a3fbb47d36ac65665e (patch)
treeedf022dd54a322e087cc385a24e21741105f508f
parentde3fc4cd3b2560cfb0ad7e2d1421271b5aa661d1 (diff)
parent27022a622ddfd7610300fe6766d128b7742bb213 (diff)
downloadpin-project-877ecd6a34c5af7d0b1661a3fbb47d36ac65665e.tar.gz
Support building all variants. am: 27022a622d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project/+/1356188 Change-Id: If929a64a05cef5820cd8bc2f0c1a7c8234a42e1e
-rw-r--r--Android.bp2
-rw-r--r--src/lib.rs3
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;