commit efb42a634d163ee540faabc5dd1eaa13794cafb6
author Joel Galenson <jgalenson@google.com> Wed Dec 15 18:06:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 18:06:51 2021 +0000
tree d20614eeedc5d5cb9ddd08b43270680211ecb5a1
parent 8676ea259615f7edb9eb0b86618d4c1ec345e52c
parent 3252cded4b7668899a563922ebf21251abf9fc13

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 2ce4f4b476 am: 7aef4d7a59 am: 8af04a6a47 am: 3252cded4b

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

Change-Id: I9411de8a9ac10f8e80fac0557c1661ca92c93bb9

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 82662b1..7325ef4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,5 +16,22 @@
     {
       "name": "virtualizationservice_device_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index e888e21..85a6aa6 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,4 +6,4 @@
   "device": true,
   "features": "zlib",
   "run": true
-}
+}
\ No newline at end of file