Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

2 files changed, 36 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 48be793..e92f31e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
     name: "libtextwrap",
     host_supported: true,
     crate_name: "textwrap",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.14.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
     apex_available: [
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": "keystore2_test"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "keystore2_vintf_test"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "keystore2_test"
+      "name": "open_then_run_module"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "legacykeystore_test"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "keystore2_test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "open_then_run_module"
     }
   ]
 }