Snap for 11841552 from 638e33bd399281010054cb2be13f04d1ce0918e6 to sdk-releasesdk-release

Change-Id: I186fee0a8ead9ad4fab79c8e9a3b8d9df48abe76

3 files changed, 20 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index b09889c..a018bc8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 // This file is generated by cargo_embargo.
-// Do not modify this file as changes will be overridden on upgrade.
+// Do not modify this file after the first "rust_*" or "genrule" module
+// because the changes will be overridden on upgrade.
+// Content before the first "rust_*" or "genrule" module is preserved.
 
 package {
     default_applicable_licenses: ["external_rust_crates_cast_license"],
diff --git a/patches/std.diff b/patches/std.diff
new file mode 100644
index 0000000..76f18e6
--- /dev/null
+++ b/patches/std.diff
@@ -0,0 +1,14 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index f1db3fc..40d3c91 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -105,6 +105,9 @@ use std::error;
+ #[cfg(test)]
+ mod test;
+ 
++#[cfg(android_dylib)]
++extern crate std;
++
+ /// Cast errors
+ #[derive(Clone, Copy, Debug, Eq, PartialEq)]
+ pub enum Error {
diff --git a/src/lib.rs b/src/lib.rs
index f1db3fc..40d3c91 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -105,6 +105,9 @@ use std::error;
 #[cfg(test)]
 mod test;
 
+#[cfg(android_dylib)]
+extern crate std;
+
 /// Cast errors
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Error {