aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHasini Gunasinghe <hasinitg@google.com>2022-05-19 15:58:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-19 15:58:16 +0000
commita533ecddca1d4b41575645d0bd386d87dceeb83c (patch)
tree637528226ec2c16943147d948fb1d1597b6f1e70
parent525a0dd9ae3269ccd7bd5db2a402195f67c5dd7a (diff)
parent18506cfdbc11cd173be124b8686588a8d0bf6b1c (diff)
downloadciborium-io-a533ecddca1d4b41575645d0bd386d87dceeb83c.tar.gz
Restrict the import of std crate to dylib only. am: eaeefa6490 am: 18506cfdbc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-io/+/2097481 Change-Id: I8d1d77e1b5fd5253cb9b8a560b97a1694d70b76a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--patches/std.diff3
-rw-r--r--src/lib.rs2
2 files changed, 3 insertions, 2 deletions
diff --git a/patches/std.diff b/patches/std.diff
index fcb2329..d27ac7c 100644
--- a/patches/std.diff
+++ b/patches/std.diff
@@ -5,7 +5,8 @@ index c887e19..0594e8c 100644
@@ -19,6 +19,8 @@
#![deny(clippy::all)]
#![deny(clippy::cargo)]
-
+ -
+ +#[cfg(android_dylib)]
+extern crate std;
+
#[cfg(feature = "alloc")]
diff --git a/src/lib.rs b/src/lib.rs
index 0594e8c..80125bf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,7 @@
#![deny(missing_docs)]
#![deny(clippy::all)]
#![deny(clippy::cargo)]
-
+#[cfg(android_dylib)]
extern crate std;
#[cfg(feature = "alloc")]