Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a5341a6140

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

Change-Id: I50dffcbb28155b86cf26147159e35b0f99438455
diff --git a/Android.bp b/Android.bp
index 3022ab7..b2544e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@
     name: "libvsock",
     host_supported: true,
     crate_name: "vsock",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.4",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -33,9 +35,3 @@
         "com.android.virt",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   bitflags-1.2.1 "default"
-//   cfg-if-1.0.0
-//   libc-0.2.98 "default,extra_traits,std"
-//   nix-0.19.1
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ab8f416..b7c1df9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,5 +7,13 @@
     {
       "name": "virtualizationservice_device_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 5c18d15..42b7833 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,4 +6,4 @@
   "dependencies": true,
   "device": true,
   "run": true
-}
+}
\ No newline at end of file