diff --git a/Android.bp b/Android.bp
index 5faa928..0f5a227 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: "bitflags_defaults",
+    crate_name: "bitflags",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+    ],
+    flags: [
+        "--cfg bitflags_const_fn",
+    ],
+}
+
+rust_test_host {
+    name: "bitflags_host_test_src_lib",
+    defaults: ["bitflags_defaults"],
+    // has rustc warnings
+    srcs: ["src/lib.rs"],
+}
+
+rust_test {
+    name: "bitflags_device_test_src_lib",
+    defaults: ["bitflags_defaults"],
+    // has rustc warnings
+    srcs: ["src/lib.rs"],
+}
 
 rust_library {
     name: "libbitflags",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..d4d74c8
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "bitflags_host_test_src_lib",
+      "host": true
+    },
+    {
+      "name": "bitflags_device_test_src_lib"
+    }
+  ]
+}