Snap for 8006021 from a3c757545f3449a212d1f23b39a87b8e04d88360 to tm-release
Change-Id: Ic2fa9eb7077b5fcaf0de4df33be819d79d83249f
diff --git a/Android.bp b/Android.bp
index a82df7f..6027693 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,14 +38,18 @@
],
}
-rust_defaults {
- name: "itoa_test_defaults",
+rust_test {
+ name: "itoa_test_tests_test",
+ host_supported: true,
crate_name: "test",
- srcs: ["tests/test.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.4.8",
+ srcs: ["tests/test.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
features: [
"default",
@@ -56,19 +60,6 @@
],
}
-rust_test_host {
- name: "itoa_host_test_tests_test",
- defaults: ["itoa_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "itoa_device_test_tests_test",
- defaults: ["itoa_test_defaults"],
-}
-
rust_library {
name: "libitoa",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 82e93e3..9095ded 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,41 +1,63 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/bitflags"
+ },
+ {
+ "path": "external/rust/crates/either"
+ },
+ {
+ "path": "external/rust/crates/rand_chacha"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/url"
+ }
+ ],
"presubmit": [
{
- "name": "base64_device_test_tests_decode"
+ "name": "ZipFuseTest"
},
{
- "name": "base64_device_test_tests_encode"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "base64_device_test_tests_helpers"
+ "name": "itoa_test_tests_test"
},
{
- "name": "bitflags_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "bitflags_device_test_tests_basic"
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
},
{
- "name": "either_device_test_src_lib"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "itoa_device_test_tests_test"
+ "name": "itoa_test_tests_test"
},
{
- "name": "unicode-xid_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
- },
- {
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "name": "url_device_test_tests_unit"
+ "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
"device": true,
"run": true,
"tests": true
-}
+}
\ No newline at end of file