Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9a295d8629 am: f58679b0c4 am: c20285fe9e am: 3d0228edea

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/paste/+/1912656

Change-Id: Id0ff49f667d92b4fe98f28d2e858a5e3ecf90ebe

3 files changed, 20 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 1c0a8b7..0d0a1a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -40,6 +40,8 @@ license {
 rust_proc_macro {
     name: "libpaste",
     crate_name: "paste",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.5",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5f77ae8..162f83f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/gdbstub_arch"
+    }
+  ],
   "presubmit": [
     {
       "name": "ZipFuseTest"
@@ -8,7 +13,15 @@
       "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "gdbstub_arch_device_test_src_lib"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "authfs_device_test_src_lib"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..958632b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,3 @@
+{
+  "run": true
+}
\ No newline at end of file