Snap for 8006021 from 651ebb93d78e18430b45b0e2a0a6eabf4239a7b7 to tm-d1-release Change-Id: Idb0f59b1e404df9ffa8e5b31c3d67e6222716431

diff --git a/Android.bp b/Android.bp
index f1b717b..488af76 100644
--- a/Android.bp
+++ b/Android.bp

@@ -36,6 +36,8 @@
     // has rustc warnings
     host_supported: true,
     crate_name: "clap",
+    cargo_env_compat: true,
+    cargo_pkg_version: "2.33.3",
     srcs: ["src/lib.rs"],
     edition: "2015",
     rustlibs: [
@@ -48,7 +50,3 @@
         "com.android.virt",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   bitflags-1.2.1 "default"
-//   textwrap-0.13.4

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6f7692b..27b2010 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING

@@ -1,5 +1,22 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/libsqlite3-sys"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
@@ -11,31 +28,39 @@
       "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
       "name": "keystore2_test"
     },
     {
+      "name": "keystore2_vintf_test"
+    },
+    {
       "name": "legacykeystore_test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "open_then_run_module"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    },
+    {
+      "name": "open_then_run_module"
     }
   ]
 }