1 files changed, 5 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index 7a65237..d98d15c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,26 +62,17 @@ rust_library {
     min_sdk_version: "S",
 }
 
-rust_defaults {
-    name: "rustc-demangle_test_defaults",
+rust_test {
+    name: "rustc-demangle_test_src_lib",
+    host_supported: true,
     crate_name: "rustc_demangle",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.1.21",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    edition: "2015",
-}
-
-rust_test_host {
-    name: "rustc-demangle_host_test_src_lib",
-    defaults: ["rustc-demangle_test_defaults"],
     test_options: {
         unit_test: true,
     },
-}
-
-rust_test {
-    name: "rustc-demangle_device_test_src_lib",
-    defaults: ["rustc-demangle_test_defaults"],
+    edition: "2015",
 }