diff --git a/Android.bp b/Android.bp
index c2dac46..9edb754 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --tests --dependencies.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -39,10 +39,131 @@
     ],
 }
 
+rust_defaults {
+    name: "crossbeam-deque_test_defaults",
+    crate_name: "crossbeam_deque",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.1",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "crossbeam-epoch",
+        "crossbeam-utils",
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_epoch",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+}
+
+rust_test_host {
+    name: "crossbeam-deque_host_test_src_lib",
+    defaults: ["crossbeam-deque_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-deque_device_test_src_lib",
+    defaults: ["crossbeam-deque_test_defaults"],
+}
+
+rust_defaults {
+    name: "crossbeam-deque_test_defaults_crossbeam_deque",
+    crate_name: "crossbeam_deque",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.1",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "crossbeam-epoch",
+        "crossbeam-utils",
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_deque",
+        "libcrossbeam_epoch",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+}
+
+rust_test_host {
+    name: "crossbeam-deque_host_test_tests_fifo",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/fifo.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-deque_device_test_tests_fifo",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/fifo.rs"],
+}
+
+rust_test_host {
+    name: "crossbeam-deque_host_test_tests_injector",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/injector.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-deque_device_test_tests_injector",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/injector.rs"],
+}
+
+rust_test_host {
+    name: "crossbeam-deque_host_test_tests_lifo",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/lifo.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-deque_device_test_tests_lifo",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/lifo.rs"],
+}
+
+rust_test_host {
+    name: "crossbeam-deque_host_test_tests_steal",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/steal.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "crossbeam-deque_device_test_tests_steal",
+    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+    srcs: ["tests/steal.rs"],
+}
+
 rust_library {
     name: "libcrossbeam_deque",
     host_supported: true,
     crate_name: "crossbeam_deque",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -57,12 +178,3 @@
         "libcrossbeam_utils",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   cfg-if-1.0.0
-//   crossbeam-epoch-0.9.5 "alloc,lazy_static,std"
-//   crossbeam-utils-0.8.5 "lazy_static,std"
-//   lazy_static-1.4.0
-//   memoffset-0.6.4 "default"
-//   scopeguard-1.1.0