diff --git a/Android.bp b/Android.bp
index 9edb754..f89ca1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -42,42 +42,6 @@
 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"],
@@ -98,9 +62,10 @@
     ],
 }
 
-rust_test_host {
-    name: "crossbeam-deque_host_test_tests_fifo",
-    defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"],
+rust_test {
+    name: "crossbeam-deque_test_tests_fifo",
+    defaults: ["crossbeam-deque_test_defaults"],
+    host_supported: true,
     srcs: ["tests/fifo.rs"],
     test_options: {
         unit_test: true,
@@ -108,14 +73,9 @@
 }
 
 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"],
+    name: "crossbeam-deque_test_tests_injector",
+    defaults: ["crossbeam-deque_test_defaults"],
+    host_supported: true,
     srcs: ["tests/injector.rs"],
     test_options: {
         unit_test: true,
@@ -123,14 +83,9 @@
 }
 
 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"],
+    name: "crossbeam-deque_test_tests_lifo",
+    defaults: ["crossbeam-deque_test_defaults"],
+    host_supported: true,
     srcs: ["tests/lifo.rs"],
     test_options: {
         unit_test: true,
@@ -138,26 +93,15 @@
 }
 
 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"],
+    name: "crossbeam-deque_test_tests_steal",
+    defaults: ["crossbeam-deque_test_defaults"],
+    host_supported: true,
     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,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f9675a2..3601da1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,35 +1,45 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
   "presubmit": [
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "crossbeam-deque_test_tests_fifo"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "crossbeam-deque_test_tests_injector"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "name": "crossbeam-deque_test_tests_lifo"
     },
     {
-      "name": "crossbeam-deque_device_test_src_lib"
+      "name": "crossbeam-deque_test_tests_steal"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "crossbeam-deque_test_tests_fifo"
     },
     {
-      "name": "crossbeam-deque_device_test_tests_fifo"
+      "name": "crossbeam-deque_test_tests_injector"
     },
     {
-      "name": "crossbeam-deque_device_test_tests_injector"
+      "name": "crossbeam-deque_test_tests_lifo"
     },
     {
-      "name": "crossbeam-deque_device_test_tests_lifo"
-    },
-    {
-      "name": "crossbeam-deque_device_test_tests_steal"
-    },
-    {
-      "name": "unicode-xid_device_test_src_lib"
-    },
-    {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "crossbeam-deque_test_tests_steal"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file