1 files changed, 13 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
index 1373a19..4d8da17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,9 +1,6 @@
 // This file is generated by cargo2android.py --run --device --tests.
-// Manually split host and device tests,
-// and link in static libraries for device tests.
-// But, device tests cannot link with both libstd.static and libslab.
 
-rust_library_rlib {
+rust_library {
     name: "libslab",
     host_supported: true,
     crate_name: "slab",
@@ -27,11 +24,6 @@ rust_test {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
-    rlibs: [
-        "libstd.static",
-        "libtest.static",
-        "libterm.static",
-    ],
 }
 
 rust_test_host {
@@ -41,22 +33,19 @@ rust_test_host {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
-    rlibs: [
+    rustlibs: [
         "libslab",
     ],
 }
 
-// rust_test {
-//     name: "slab_device_tests_slab1",
-//     crate_name: "slab",
-//     srcs: ["tests/slab.rs"],
-//     test_suites: ["general-tests"],
-//     auto_gen_config: true,
-//     edition: "2015",
-//     rlibs: [
-//         "libslab",
-//         "libstd.static",
-//         "libtest.static",
-//         "libterm.static",
-//     ],
-// }
+rust_test {
+    name: "slab_device_tests_slab1",
+    crate_name: "slab",
+    srcs: ["tests/slab.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    rustlibs: [
+        "libslab",
+    ],
+}