aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp4
-rw-r--r--patches/std.diff14
-rw-r--r--src/lib.rs3
3 files changed, 19 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index a018bc8..37f9b57 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,7 +45,7 @@ rust_test {
crate_name: "cast",
cargo_env_compat: true,
cargo_pkg_version: "0.3.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
test_options: {
@@ -61,7 +61,7 @@ rust_library {
crate_name: "cast",
cargo_env_compat: true,
cargo_pkg_version: "0.3.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2018",
apex_available: [
"//apex_available:platform",
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 {