diff --git a/Android.bp b/Android.bp
index dbf3982..0d8524e 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 {
@@ -37,41 +37,33 @@
     ],
 }
 
-rust_defaults {
-    name: "heck_defaults",
+rust_test {
+    name: "heck_test_src_lib",
+    host_supported: true,
     crate_name: "heck",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.3",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libunicode_segmentation",
     ],
 }
 
-rust_test_host {
-    name: "heck_host_test_src_lib",
-    defaults: ["heck_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "heck_device_test_src_lib",
-    defaults: ["heck_defaults"],
-}
-
 rust_library {
     name: "libheck",
     host_supported: true,
     crate_name: "heck",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
         "libunicode_segmentation",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   unicode-segmentation-1.7.1
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5dacebd..af9eb77 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,24 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    }
+  ],
   "presubmit": [
     {
       "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "heck_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "name": "heck_device_test_src_lib"
+      "name": "heck_test_src_lib"
     }
   ]
 }
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