commit 4742293d9c966485fdb0c11abbead402779fb525
author Joel Galenson <jgalenson@google.com> Wed Dec 15 18:07:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 18:07:20 2021 +0000
tree c9278f52ec614b19d52386d5b40b15a17d324a21
parent f178953783bbea245b936866a429f99215c4e607
parent f9dd168e8101466a9a63d2f26772e66f69f6b535

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5015202c39 am: 71eec6d24c am: 2912f3ba5c am: f9dd168e81

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-parser/+/1912800

Change-Id: Ifae7e177edf6c605dbb710969bc30a6c9fb977d4

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 525e195..08b3cb2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,5 +10,16 @@
     {
       "name": "microdroid_manager_test"
     }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 5f001a6..c01fbda 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,7 @@
 {
-    "dependency-blocklist": [
-        "data_encoding"
-    ],
-    "device": true,
-    "run": true
-}
-
+  "dependency-blocklist": [
+    "data_encoding"
+  ],
+  "device": true,
+  "run": true
+}
\ No newline at end of file