Snap for 11878398 from e0ccdb38862c066189d5159dc2f82481235bc1d1 to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: I688404fa3bf34eaa73f516c2de89bb0a18362f38

3 files changed, 22 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 3de525b..ae0d629 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_libm_license"],
@@ -44,7 +46,7 @@ rust_library {
     crate_name: "libm",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.8",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     edition: "2018",
     features: ["default"],
     apex_available: [
@@ -62,7 +64,7 @@ rust_test {
     crate_name: "libm",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.8",
-    srcs: ["src/lib.rs"],
+    crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
diff --git a/patches/std.patch b/patches/std.patch
new file mode 100644
index 0000000..76b5c02
--- /dev/null
+++ b/patches/std.patch
@@ -0,0 +1,14 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 4a17d3a..5493509 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -12,6 +12,9 @@
+ #![allow(clippy::eq_op)]
+ #![allow(clippy::assign_op_pattern)]
+ 
++#[cfg(android_dylib)]
++extern crate std;
++
+ mod libm_helper;
+ mod math;
+ 
diff --git a/src/lib.rs b/src/lib.rs
index 4a17d3a..5493509 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,6 +12,9 @@
 #![allow(clippy::eq_op)]
 #![allow(clippy::assign_op_pattern)]
 
+#[cfg(android_dylib)]
+extern crate std;
+
 mod libm_helper;
 mod math;