commit f5755112bf79c6cc117d25ec601a98b7f8de5460
author Matthew Maurer <mmaurer@google.com> Tue Jul 07 01:20:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 07 01:20:58 2020 +0000
tree 090bb8be1808ec2ee21350911701fe3886507695
parent cc67c7630dbec96d5ce797401ed29341a3b69ab3
parent 5bb571a3f99ee33fddd225e0be022c00ead228d6

Support building all variants. am: 23898638d2 am: 07ad55abe8 am: 5bb571a3f9

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

Change-Id: I3eb0fa2f2c0b6b362786b18bb295473ee94cd15f

Android.bp

diff --git a/Android.bp b/Android.bp
index 1bb2d62..a51668d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,7 +2,7 @@
 // Manually split host and device tests,
 // and link in static libraries for device tests.
 
-rust_library_rlib {
+rust_library {
     name: "libpin_utils",
     host_supported: true,
     crate_name: "pin_utils",
@@ -16,7 +16,7 @@
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
-    rlibs: [
+    rustlibs: [
         "libpin_utils",
     ],
 }

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 6198e98..48ac257 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,6 +6,9 @@
 #![allow(unknown_lints)]
 #![doc(html_root_url = "https://docs.rs/pin-utils/0.1.0")]
 
+// ANDROID: Use std to allow building as a dylib.
+extern crate std;
+
 #[doc(hidden)]
 pub mod core_reexport {
     pub use core::*;