aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2021-04-28 02:12:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-28 02:12:26 +0000
commitd759dfe9863cca7f493112ed7e3d78fc07bd77ac (patch)
treeeb1b6622bb33a51fd48430de7900c04e62c6a25b
parent847a57887b57e68bccd9ff1adaf30f8c29bd8470 (diff)
parentcd15ec95a78610ef5003fd43d9cef6007a4ef2ef (diff)
downloaduntrusted-d759dfe9863cca7f493112ed7e3d78fc07bd77ac.tar.gz
Merge "Allow lint not compatible with this version." am: 1432fccf1f am: 7b3a4124e5 am: 82305a2c8d am: cd15ec95a7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1662921 Change-Id: I2a829f849c17472fd13ecbfec0ff0b805b0c93fb
-rw-r--r--src/untrusted.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/untrusted.rs b/src/untrusted.rs
index b9f1439..a9d7f7b 100644
--- a/src/untrusted.rs
+++ b/src/untrusted.rs
@@ -100,6 +100,9 @@
variant_size_differences,
warnings
)]
+// ANDROID: This lint is included in warnings and thus forbidden, but this version of the library
+// is not compatible with it.
+#![allow(non_autolinks)]
#![no_std]
// ANDROID: Unconditionally use std to allow building as a dylib.