diff --git a/Android.bp b/Android.bp
index aaf1015..5e67fb1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -44,6 +44,8 @@
     name: "libunicode_segmentation",
     host_supported: true,
     crate_name: "unicode_segmentation",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.8.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5dacebd..c934591 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,21 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/heck"
+    }
+  ],
   "presubmit": [
     {
       "name": "authfs_device_test_src_lib"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "name": "heck_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file