commit 915d4943d64ab87636f50ee8dfc22627375146a1
author Joel Galenson <jgalenson@google.com> Wed Dec 15 18:06:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 18:06:46 2021 +0000
tree ab9eb629df900c6df3cfe845466f12b168658c83
parent 4c38b989930fc43dc957d1291ea6dce5655be920
parent f00f96a9b9995b391e838a247ffe0bff053d6220

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9fe9eaa843 am: 48df0e42d6 am: 6738a42e35 am: f00f96a9b9

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der-oid-macro/+/1912639

Change-Id: I35294458e95e1fa3a33b8c0375f4d49171c856b3

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 50bf622..bf78496 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,4 @@
 {
-    "device": true,
-    "run": true
-}
-
+  "device": true,
+  "run": true
+}
\ No newline at end of file