diff --git a/Android.bp b/Android.bp
index 8e517fb..2ab4b41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,32 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+
+rust_defaults {
+    name: "futures-task_defaults",
+    crate_name: "futures_task",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "once_cell",
+        "std",
+    ],
+    rustlibs: [
+        "libonce_cell",
+    ],
+}
+
+rust_test_host {
+    name: "futures-task_host_test_src_lib",
+    defaults: ["futures-task_defaults"],
+}
+
+rust_test {
+    name: "futures-task_device_test_src_lib",
+    defaults: ["futures-task_defaults"],
+}
 
 rust_library {
     name: "libfutures_task",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..889fec3
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "futures-task_host_test_src_lib",
+      "host": true
+    },
+    {
+      "name": "futures-task_device_test_src_lib"
+    }
+  ]
+}