aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHasini Gunasinghe <hasinitg@google.com>2022-05-19 16:24:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-19 16:24:06 +0000
commit93da6338b3a70320fc5fd9ba59b3305138d6ca87 (patch)
tree36f779c2efb7e7a01cd1544bc91ea42afabf6e22
parentd9b77fd7cfd092afd5776b062fb2de36ba7c5218 (diff)
parent1bf4c71ef066e89c09033ffc0effba9935bf3ce4 (diff)
downloadunicode-xid-93da6338b3a70320fc5fd9ba59b3305138d6ca87.tar.gz
Restrict the import of std crate to dylib only. am: b8d1a747d4 am: 51fe992c94 am: 1bf4c71ef0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-xid/+/2098651 Change-Id: Ibad7a08f277e81fb8d752ba33b69113c5d87f169 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--patches/std.diff1
-rw-r--r--src/lib.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/patches/std.diff b/patches/std.diff
index 73141c0..8237bc9 100644
--- a/patches/std.diff
+++ b/patches/std.diff
@@ -11,6 +11,7 @@ index 01c81e2..927fc9a 100644
+// #[cfg(test)]
+// ANDROID: Unconditionally use std to allow building as a dylib.
+// #[macro_use]
++#[cfg(android_dylib)]
extern crate std;
#[cfg(feature = "bench")]
diff --git a/src/lib.rs b/src/lib.rs
index 012124f..b4d5a1a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,6 +40,7 @@
// #[cfg(test)]
// ANDROID: Unconditionally use std to allow building as a dylib.
// #[macro_use]
+#[cfg(android_dylib)]
extern crate std;
#[cfg(feature = "bench")]