Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I5d2d7751a7012b233e8d2b80f32a56d89250f8e7

1 files changed, 7 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 23f810f..0f45ce1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,14 +47,18 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "mio_test_defaults",
+rust_test {
+    name: "mio_test_src_lib",
+    host_supported: true,
     crate_name: "mio",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.7.13",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "net",
@@ -72,16 +76,3 @@ rust_defaults {
         "librand",
     ],
 }
-
-rust_test_host {
-    name: "mio_host_test_src_lib",
-    defaults: ["mio_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "mio_device_test_src_lib",
-    defaults: ["mio_test_defaults"],
-}