1 files changed, 13 insertions, 11 deletions
diff --git a/rust/Android.bp b/rust/Android.bp
index 8f6bcdb..2d5730e 100644
--- a/rust/Android.bp
+++ b/rust/Android.bp
@@ -172,23 +172,25 @@ rust_library {
     ],
 }
 
-// device test: no std, no features.
-// Note: we are testing the nostd version of the library but the tests
-// themselves do use std.
+rust_defaults {
+    name: "libavb_rs_test.defaults",
+    srcs: ["tests/tests.rs"],
+    test_suites: ["general-tests"],
+}
+
+// device test: no features.
 rust_test {
     name: "libavb_rs_test",
-    defaults: [
-        "libavb_rs_nostd.defaults",
-    ],
-    test_suites: ["general-tests"],
+    defaults: ["libavb_rs_test.defaults"],
+    rustlibs: ["libavb_rs"],
 }
 
-// device test: no std, UUID feature.
+// device test: UUID feature.
 rust_test {
     name: "libavb_rs_uuid_test",
     defaults: [
-        "libavb_rs_nostd.defaults",
-        "libavb_rs_nostd.uuid.defaults",
+        "libavb_rs_test.defaults",
+        "libavb_rs.uuid.defaults",
     ],
-    test_suites: ["general-tests"],
+    rustlibs: ["libavb_rs_uuid"],
 }