1 files changed, 8 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index 6dd0de1..3d33d9c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -50,28 +50,19 @@ rust_library {
     features: ["default"],
 }
 
-rust_defaults {
-    name: "unicode-width_test_defaults",
-    crate_name: "unicode_width",
+rust_test {
+    name: "unicode-width_test_src_lib",
     // has rustc warnings
-    srcs: ["src/lib.rs"],
+    host_supported: true,
+    crate_name: "unicode_width",
     cargo_env_compat: true,
     cargo_pkg_version: "0.1.9",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    edition: "2015",
-    features: ["default"],
-}
-
-rust_test_host {
-    name: "unicode-width_host_test_src_lib",
-    defaults: ["unicode-width_test_defaults"],
     test_options: {
         unit_test: true,
     },
-}
-
-rust_test {
-    name: "unicode-width_device_test_src_lib",
-    defaults: ["unicode-width_test_defaults"],
+    edition: "2015",
+    features: ["default"],
 }