commit e7e3490c32bc17b9274ccbfe6e4356a993af59d4
author Joel Galenson <jgalenson@google.com> Wed Dec 15 15:28:00 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 15 15:28:00 2021 +0000
tree 48af30bff436892b7b4a7c3cb05b748be92e6450
parent 15ac8fae5044e640b957a6063b53a8f6d9d612fa
parent fcd61b99b54fa0169f26eaedf85935156eded06c

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."

Android.bp

diff --git a/Android.bp b/Android.bp
index 15f699c..6cf914d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@
     // has rustc warnings
     host_supported: true,
     crate_name: "intrusive_collections",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.9.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -58,7 +60,3 @@
         "com.android.virt",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   memoffset-0.5.6 "default"

TEST_MAPPING

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"
+    }
   ]
 }