From ac05fd02486d5275193a4041f0ff74361249e68b Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:03:33 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I182a5fe76749553ddbff111480cdeb87501a444f
---
 TEST_MAPPING       | 15 ++++++++++++++-
 cargo2android.json |  9 ++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

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"
     }
   ]
 }
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
-- 
cgit v1.2.3