Snap for 8006021 from f9850d8324a5b52ff1b275a0cd3e4f5fddca1739 to tm-d1-release
Change-Id: I0715aced52a382df8853604352ed898c861d1bdd
diff --git a/Android.bp b/Android.bp
index 6dd0de1..3d33d9c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --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 {
@@ -50,28 +50,19 @@
features: ["default"],
}
-rust_defaults {
- name: "unicode-width_test_defaults",
- crate_name: "unicode_width",
+rust_test {
+ name: "unicode-width_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "unicode_width",
cargo_env_compat: true,
cargo_pkg_version: "0.1.9",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2015",
- features: ["default"],
-}
-
-rust_test_host {
- name: "unicode-width_host_test_src_lib",
- defaults: ["unicode-width_test_defaults"],
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "unicode-width_device_test_src_lib",
- defaults: ["unicode-width_test_defaults"],
+ edition: "2015",
+ features: ["default"],
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b539787..6d1be59 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,30 @@
{
"presubmit": [
{
- "name": "unicode-width_device_test_src_lib"
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "unicode-width_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "unicode-width_test_src_lib"
}
]
}
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
