1 files changed, 8 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index 4d8ed7e..57a3add 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: [
         "external_rust_crates_rustc-demangle-capi_license",
@@ -71,27 +69,20 @@ rust_ffi_static {
     min_sdk_version: "S",
 }
 
-rust_defaults {
-    name: "rustc-demangle-capi_test_defaults",
+rust_test {
+    name: "rustc-demangle-capi_test_src_lib",
+    host_supported: true,
     crate_name: "rustc_demangle",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     rustlibs: [
         "librustc_demangle",
     ],
 }
-
-rust_test_host {
-    name: "rustc-demangle-capi_host_test_src_lib",
-    defaults: ["rustc-demangle-capi_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "rustc-demangle-capi_device_test_src_lib",
-    defaults: ["rustc-demangle-capi_test_defaults"],
-}