Snap for 8006021 from 7e6387d1f117d0ffebef0ac9c48eaf21ae751040 to tm-release
Change-Id: Ie0cb56fcbc2f5ffc2f6e286c85b121a13cf5fef9
diff --git a/Android.bp b/Android.bp
index 000ca9a..8eacade 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,28 +54,19 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "libm_test_defaults",
+rust_test {
+ name: "libm_test_src_lib",
+ host_supported: true,
crate_name: "libm",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.2.1",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2018",
- features: ["default"],
- proc_macros: ["libno_panic"],
-}
-
-rust_test_host {
- name: "libm_host_test_src_lib",
- defaults: ["libm_test_defaults"],
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "libm_device_test_src_lib",
- defaults: ["libm_test_defaults"],
+ edition: "2018",
+ features: ["default"],
+ proc_macros: ["libno_panic"],
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 99842b9..bfdf123 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,14 +1,24 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/quiche"
+ }
+ ],
"presubmit": [
{
"name": "doh_unit_test"
},
{
- "name": "libm_device_test_src_lib"
+ "name": "libm_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "doh_unit_test"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "libm_test_src_lib"
}
]
}