Snap for 7085169 from b5fe630547d175a5d935a5509108b5d40c20a4cc to sc-release

Change-Id: I6ef98f6d1dfbe4220887d3b69a6e8fa1258bf728

2 files changed, 10 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 95882d0..e679a38 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,6 +27,9 @@ rust_defaults {
 rust_test_host {
     name: "matches_host_test_lib",
     defaults: ["matches_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -50,6 +53,9 @@ rust_defaults {
 rust_test_host {
     name: "matches_host_test_tests_macro_use_one",
     defaults: ["matches_defaults_macro_use_one"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8b581f0..138b36c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,16 +1,14 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by cargo2android.py for tests that depend on this crate.
 {
   "presubmit": [
     {
-      "host": true,
-      "name": "matches_host_test_lib"
+      "name": "matches_device_test_lib"
     },
     {
-      "name": "matches_device_test_lib"
+      "name": "url_device_test_src_lib"
     },
     {
-      "host": true,
-      "name": "matches_host_test_tests_macro_use_one"
+      "name": "unicode-bidi_device_test_src_lib"
     },
     {
       "name": "matches_device_test_tests_macro_use_one"