Snap for 8006021 from 84f74a3737bc6acce9f2c12e731ebeddd0271014 to tm-release
Change-Id: I052ee74632e90ada61fa9ee27b3f99c0a37e080a
diff --git a/Android.bp b/Android.bp
index 9ffbcc2..fe1cd25 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -37,29 +37,20 @@
],
}
-rust_defaults {
- name: "lazycell_test_defaults",
- crate_name: "lazycell",
+rust_test {
+ name: "lazycell_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "lazycell",
cargo_env_compat: true,
cargo_pkg_version: "1.3.0",
+ srcs: ["src/lib.rs"],
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"],
+ edition: "2015",
}
rust_library {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e548a18..ff34c26 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,30 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ }
+ ],
"presubmit": [
{
"name": "keystore2_test"
},
{
- "name": "lazycell_device_test_src_lib"
+ "name": "lazycell_test_src_lib"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "lazycell_test_src_lib"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "legacykeystore_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file