aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHasini Gunasinghe <hasinitg@google.com>2022-05-19 17:45:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-19 17:45:56 +0000
commit27ca82cd8f429338d2536d4d6abfbe98822eeead (patch)
tree36f779c2efb7e7a01cd1544bc91ea42afabf6e22
parent1d0b5ddf71b2a34e7bf94b02bb25de5fc7d6959c (diff)
parentd7c8d4e625de1b5e9118e93f680ff1e3b1099b34 (diff)
downloadunicode-xid-27ca82cd8f429338d2536d4d6abfbe98822eeead.tar.gz
Restrict the import of std crate to dylib only. am: b8d1a747d4 am: 51fe992c94 am: 1bf4c71ef0 am: 93da6338b3 am: d7c8d4e625
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-xid/+/2098651 Change-Id: I9dd54b6a49d29a1cad7c5fb58b7fe2d4e9df02a7 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")]