diff --git a/Android.bp b/Android.bp
index b1393c7..0b36523 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_async-task_license"],
@@ -38,16 +39,18 @@
 
 rust_library {
     name: "libasync_task",
+    host_supported: true,
     crate_name: "async_task",
+    cargo_env_compat: true,
+    cargo_pkg_version: "4.0.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    host_supported: true,
     features: [
         "default",
         "std",
     ],
     apex_available: [
         "//apex_available:platform",
-	"com.android.virt",
+        "com.android.virt",
     ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..fc8ec65
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,25 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..707d26c
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,8 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "device": true,
+  "run": true
+}
\ No newline at end of file