From 6ec5756af43c3318800cb931df9cc0ee61fa65e6 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Thu, 2 Dec 2021 08:15:02 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I576359e62326fc41c9b64c115e2ed622a7bbc7c4
---
 Android.bp         |  8 +++-----
 TEST_MAPPING       | 25 +++++++++++++++++++++++++
 cargo2android.json |  4 ++++
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 TEST_MAPPING
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index 8f99540..e18e9ee 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 {
@@ -24,6 +24,8 @@ rust_library {
     name: "libcodespan_reporting",
     host_supported: true,
     crate_name: "codespan_reporting",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -31,7 +33,3 @@ rust_library {
         "libunicode_width",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   termcolor-1.1.2
-//   unicode-width-0.1.8 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..a3af1cf
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,25 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    }
+  ]
+}
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
-- 
cgit v1.2.3


From 8a2d4e7270796af4af44a35487181b63c6e241af Mon Sep 17 00:00:00 2001
From: David LeGare <legare@google.com>
Date: Wed, 2 Mar 2022 19:54:37 +0000
Subject: Update TEST_MAPPING

Test: cd external/rust/crates && atest --host -c
Change-Id: I38ee863df6a12acf5f74eeec9cfeb6561ded4113
---
 TEST_MAPPING | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index a3af1cf..d7399cf 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,6 +1,9 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
   "presubmit": [
+    {
+      "name": "diced_test"
+    },
     {
       "name": "keystore2_test"
     },
@@ -12,6 +15,9 @@
     }
   ],
   "presubmit-rust": [
+    {
+      "name": "diced_test"
+    },
     {
       "name": "keystore2_test"
     },
-- 
cgit v1.2.3