Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f179e1ccbe am: 76cd8448f5

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libm/+/1912438

Change-Id: I7816008a7c28fdc4c659b33792f26b19816e5f7a

2 files changed, 19 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 000ca9a..8eacade 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,28 +54,19 @@ rust_library {
     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"
     }
   ]
 }