Regenerate Android.bp with new cargo2android.pyandroid-r-beta-3android-r-beta-2

Test: make
Change-Id: I26b3de6c721c776bd685b85326cd5c9dd6d6b077

1 files changed, 21 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 4d8da17..c542eb9 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 --run --device --tests --dependencies.
 
 rust_library {
     name: "libslab",
@@ -8,28 +8,29 @@ rust_library {
     edition: "2015",
 }
 
-rust_test_host {
-    name: "slab_host_tests_slab",
+rust_defaults {
+    name: "slab_defaults",
     crate_name: "slab",
-    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
 }
 
+rust_test_host {
+    name: "slab_host_test_src_lib",
+    defaults: ["slab_defaults"],
+    srcs: ["src/lib.rs"],
+}
+
 rust_test {
-    name: "slab_device_tests_slab",
-    crate_name: "slab",
+    name: "slab_device_test_src_lib",
+    defaults: ["slab_defaults"],
     srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
 }
 
-rust_test_host {
-    name: "slab_host_tests_slab1",
+rust_defaults {
+    name: "slab_defaults1",
     crate_name: "slab",
-    srcs: ["tests/slab.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -38,14 +39,14 @@ rust_test_host {
     ],
 }
 
+rust_test_host {
+    name: "slab_host_test_tests_slab",
+    defaults: ["slab_defaults1"],
+    srcs: ["tests/slab.rs"],
+}
+
 rust_test {
-    name: "slab_device_tests_slab1",
-    crate_name: "slab",
+    name: "slab_device_test_tests_slab",
+    defaults: ["slab_defaults1"],
     srcs: ["tests/slab.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    rustlibs: [
-        "libslab",
-    ],
 }