Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 18dbccb8a3 am: e7307945a2 am: ae023b29c3 am: 4bd63c1f77

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

Change-Id: Ic6d86af6b85eda01d1dbebe6003d0c4c1d6981e9

1 files changed, 23 insertions, 53 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index dd705a6..c1c46bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,16 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/ring"
+    },
+    {
+      "path": "external/rust/crates/webpki"
+    }
+  ],
   "presubmit": [
     {
       "name": "apkdmverity.test"
@@ -20,77 +31,36 @@
       "name": "microdroid_manager_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
-    },
-    {
-      "name": "ring_device_test_src_lib",
-      "options": [
-        {
-          "test-timeout": "100000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_aead_tests"
+      "name": "untrusted_test_tests_tests"
     },
     {
-      "name": "ring_device_test_tests_agreement_tests"
-    },
-    {
-      "name": "ring_device_test_tests_constant_time_tests"
-    },
-    {
-      "name": "ring_device_test_tests_digest_tests",
-      "options": [
-        {
-          "test-timeout": "600000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_ecdsa_tests"
-    },
-    {
-      "name": "ring_device_test_tests_ed25519_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hkdf_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hmac_tests"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "ring_device_test_tests_pbkdf2_tests"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "ring_device_test_tests_quic_tests"
+      "name": "doh_unit_test"
     },
     {
-      "name": "ring_device_test_tests_rand_tests"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "ring_device_test_tests_rsa_tests"
+      "name": "libapkverify.test"
     },
     {
-      "name": "ring_device_test_tests_signature_tests"
+      "name": "libidsig.test"
     },
     {
-      "name": "untrusted_device_test_src_untrusted"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "untrusted_device_test_tests_tests"
+      "name": "untrusted_test_tests_tests"
     },
     {
       "name": "virtualizationservice_device_test"
-    },
-    {
-      "name": "webpki_device_test_src_lib"
-    },
-    {
-      "name": "webpki_device_test_tests_dns_name_tests"
-    },
-    {
-      "name": "webpki_device_test_tests_integration"
     }
   ]
 }