commit 8650c8fba8cd3aa0a7ec57f791e46514a8055712
author Joel Galenson <jgalenson@google.com> Wed Dec 15 17:27:19 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 17:27:19 2021 +0000
tree 817299803f927c14835b0b72746d512deb08dc87
parent b1f605fbbd0bf17632c96aa1307ab848f5310e59
parent 44d2fee91da7f7124a0ca50bfa1f32d22ca42cda

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8f12ac1373 am: a2dd3ca689 am: 44d2fee91d

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

Change-Id: I74d798cc89269a845766afa6efbc49140e92559e

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 587e8a5..c758e89 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/oid-registry"
+    }
+  ],
   "presubmit": [
     {
       "name": "libapkverify.integration_test"
@@ -9,9 +14,17 @@
     },
     {
       "name": "microdroid_manager_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
     }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 1a78574..95d3b34 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,5 @@
 {
-    "device": true,
-    "features": "bigint,std",
-    "run": true
-}
-
+  "device": true,
+  "features": "bigint,std",
+  "run": true
+}
\ No newline at end of file