1 files changed, 13 insertions, 30 deletions

diff --git a/Android.bp b/Android.bp
index 1d265d8..9f055dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,6 @@ rust_library {
     host_supported: true,
     crate_name: "libsqlite3_sys",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.22.2",
     srcs: [
         "src/lib.rs",
         ":libsqlite3_bindgen",
@@ -53,16 +52,23 @@ rust_library {
         "pkg-config",
         "vcpkg",
     ],
-    shared_libs: [
-        "libsqlite",
-    ],
+    shared_libs: ["libsqlite"],
 }
 
-rust_defaults {
-    name: "libsqlite3-sys_test_defaults",
+rust_test {
+    name: "libsqlite3-sys_test_src_lib",
+    host_supported: true,
     crate_name: "libsqlite3_sys",
+    cargo_env_compat: true,
+    srcs: [
+        "src/lib.rs",
+        ":libsqlite3_bindgen",
+    ],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -70,30 +76,7 @@ rust_defaults {
         "pkg-config",
         "vcpkg",
     ],
-    shared_libs: [
-        "libsqlite",
-    ],
-}
-
-rust_test_host {
-    name: "libsqlite3-sys_host_test_src_lib",
-    srcs: [
-        "src/lib.rs",
-        ":libsqlite3_bindgen",
-    ],
-    defaults: ["libsqlite3-sys_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "libsqlite3-sys_device_test_src_lib",
-    srcs: [
-        "src/lib.rs",
-        ":libsqlite3_bindgen",
-    ],
-    defaults: ["libsqlite3-sys_test_defaults"],
+    shared_libs: ["libsqlite"],
 }
 
 rust_bindgen {