diff options
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | cargo_embargo.json | 4 | ||||
| -rw-r--r-- | patches/std.diff | 14 | ||||
| -rw-r--r-- | src/lib.rs | 3 |
5 files changed, 34 insertions, 12 deletions
@@ -1,5 +1,7 @@ -// This file is generated by cargo2android.py --config cargo2android.json. -// Do not modify this file as changes will be overridden on upgrade. +// This file is generated by cargo_embargo. +// 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"], @@ -43,16 +45,14 @@ 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: { unit_test: true, }, edition: "2018", - rustlibs: [ - "libquickcheck", - ], + rustlibs: ["libquickcheck"], } rust_library { @@ -61,6 +61,12 @@ 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", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index d36fb44..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "device": true, - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c8842d1 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,4 @@ +{ + "run_cargo": false, + "tests": true +} 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 { @@ -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 { |