Merge 904918b03c3d17e564688253924b5d438b7e3630 on remote branch
Change-Id: I89b4f0ebaac7d8eb2901bce500671976d8eb4b33
diff --git a/Android.bp b/Android.bp
index 10e72a6..9ffbcc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// This file is generated by cargo2android.py --run --dependencies --device --tests.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_lazycell_license"],
@@ -36,10 +37,38 @@
],
}
+rust_defaults {
+ name: "lazycell_test_defaults",
+ crate_name: "lazycell",
+ // has rustc warnings
+ srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.3.0",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+}
+
+rust_test_host {
+ name: "lazycell_host_test_src_lib",
+ defaults: ["lazycell_test_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "lazycell_device_test_src_lib",
+ defaults: ["lazycell_test_defaults"],
+}
+
rust_library {
name: "liblazycell",
+ // has rustc warnings
host_supported: true,
crate_name: "lazycell",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.3.0",
srcs: ["src/lib.rs"],
edition: "2015",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d87563d..e548a18 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,6 +5,9 @@
"name": "keystore2_test"
},
{
+ "name": "lazycell_device_test_src_lib"
+ },
+ {
"name": "legacykeystore_test"
},
{