1 files changed, 13 insertions, 43 deletions

diff --git a/Android.bp b/Android.bp
index b895649..91f44da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,9 +77,10 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "ryu_host_test_tests_common_test",
+rust_test {
+    name: "ryu_test_tests_common_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/common_test.rs"],
     test_options: {
         unit_test: true,
@@ -87,14 +88,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "ryu_device_test_tests_common_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/common_test.rs"],
-}
-
-rust_test_host {
-    name: "ryu_host_test_tests_d2s_table_test",
+    name: "ryu_test_tests_d2s_table_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/d2s_table_test.rs"],
     test_options: {
         unit_test: true,
@@ -102,14 +98,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "ryu_device_test_tests_d2s_table_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/d2s_table_test.rs"],
-}
-
-rust_test_host {
-    name: "ryu_host_test_tests_d2s_test",
+    name: "ryu_test_tests_d2s_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/d2s_test.rs"],
     test_options: {
         unit_test: true,
@@ -117,14 +108,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "ryu_device_test_tests_d2s_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/d2s_test.rs"],
-}
-
-rust_test_host {
-    name: "ryu_host_test_tests_f2s_test",
+    name: "ryu_test_tests_f2s_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/f2s_test.rs"],
     test_options: {
         unit_test: true,
@@ -132,14 +118,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "ryu_device_test_tests_f2s_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/f2s_test.rs"],
-}
-
-rust_test_host {
-    name: "ryu_host_test_tests_s2d_test",
+    name: "ryu_test_tests_s2d_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/s2d_test.rs"],
     test_options: {
         unit_test: true,
@@ -147,22 +128,11 @@ rust_test_host {
 }
 
 rust_test {
-    name: "ryu_device_test_tests_s2d_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/s2d_test.rs"],
-}
-
-rust_test_host {
-    name: "ryu_host_test_tests_s2f_test",
+    name: "ryu_test_tests_s2f_test",
     defaults: ["ryu_test_defaults"],
+    host_supported: true,
     srcs: ["tests/s2f_test.rs"],
     test_options: {
         unit_test: true,
     },
 }
-
-rust_test {
-    name: "ryu_device_test_tests_s2f_test",
-    defaults: ["ryu_test_defaults"],
-    srcs: ["tests/s2f_test.rs"],
-}