Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 96e6fc6ec8 am: 39ea0828a7 am: e9545a4bd3 am: cc9b9bcd97

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/async-trait/+/1912044

Change-Id: I296f031591a4ecb3365fe7c539fa65d928c3c2ab

3 files changed, 18 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 702b974..3efa2b7 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 {
@@ -40,6 +40,8 @@ license {
 rust_proc_macro {
     name: "libasync_trait",
     crate_name: "async_trait",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.51",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -48,9 +50,3 @@ rust_proc_macro {
         "libsyn",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   proc-macro2-1.0.28 "default,proc-macro"
-//   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.74 "clone-impls,default,derive,extra-traits,full,parsing,printing,proc-macro,quote,visit,visit-mut"
-//   unicode-xid-0.2.2 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 028fa2a..fc8ec65 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,5 +10,16 @@
     {
       "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..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file