Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 2064c0e144 am: e9cf9d0af0 am: a72429ce1b am: 9415e294a0

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

Change-Id: Ic90c5afd822769c720d9882efebc51137913f0ca

3 files changed, 38 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index f21067b..027e256 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,14 +37,18 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "crc32fast_test_defaults",
+rust_test {
+    name: "crc32fast_test_src_lib",
+    host_supported: true,
     crate_name: "crc32fast",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "1.2.1",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -59,19 +63,6 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "crc32fast_host_test_src_lib",
-    defaults: ["crc32fast_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "crc32fast_device_test_src_lib",
-    defaults: ["crc32fast_test_defaults"],
-}
-
 rust_library {
     name: "libcrc32fast",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2f9b261..a46d45f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,13 +2,42 @@
 {
   "presubmit": [
     {
-      "name": "crc32fast_device_test_src_lib"
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "crc32fast_test_src_lib"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "crc32fast_test_src_lib"
     },
     {
       "name": "libapkverify.integration_test"
     },
     {
       "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
   "device": true,
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file