commit 5eb829412a65993c6bd5915c09d1ecffe6a7fa53
author Joel Galenson <jgalenson@google.com> Mon Nov 29 14:04:27 2021 -0800
committer Joel Galenson <jgalenson@google.com> Fri Dec 10 15:33:03 2021 -0800
tree 0545506bd7f7032e563d2653d92f3e19204249cd
parent 45b2647cce025e868a5352d42dac584aa74903b4

Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I24539557f998e3fab515727d074d32ade0cf79be

Android.bp

diff --git a/Android.bp b/Android.bp
index 1d29c81..d49dd1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,17 +76,21 @@
     ],
 }
 
-rust_defaults {
-    name: "num-bigint_test_defaults",
+rust_test {
+    name: "num-bigint_test_src_lib",
+    host_supported: true,
     crate_name: "num_bigint",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.2",
     srcs: [
         "src/lib.rs",
         ":copy_num-bigint_build_out",
     ],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.4.2",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -102,21 +106,8 @@
     ],
 }
 
-rust_test_host {
-    name: "num-bigint_host_test_src_lib",
-    defaults: ["num-bigint_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "num-bigint_device_test_src_lib",
-    defaults: ["num-bigint_test_defaults"],
-}
-
 rust_defaults {
-    name: "num-bigint_test_defaults_num_bigint",
+    name: "num-bigint_test_defaults",
     crate_name: "num_bigint",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.2",
@@ -138,9 +129,10 @@
     ],
 }
 
-rust_test_host {
-    name: "num-bigint_host_test_tests_bigint",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+rust_test {
+    name: "num-bigint_test_tests_bigint",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/bigint.rs",
         ":copy_num-bigint_build_out",
@@ -151,17 +143,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_bigint",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/bigint.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_bigint_bitwise",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_bigint_bitwise",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/bigint_bitwise.rs",
         ":copy_num-bigint_build_out",
@@ -172,17 +156,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_bigint_bitwise",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/bigint_bitwise.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_bigint_scalar",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_bigint_scalar",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/bigint_scalar.rs",
         ":copy_num-bigint_build_out",
@@ -193,17 +169,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_bigint_scalar",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/bigint_scalar.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_biguint",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_biguint",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/biguint.rs",
         ":copy_num-bigint_build_out",
@@ -214,17 +182,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_biguint",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/biguint.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_biguint_scalar",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_biguint_scalar",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/biguint_scalar.rs",
         ":copy_num-bigint_build_out",
@@ -235,17 +195,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_biguint_scalar",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/biguint_scalar.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_modpow",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_modpow",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/modpow.rs",
         ":copy_num-bigint_build_out",
@@ -256,17 +208,9 @@
 }
 
 rust_test {
-    name: "num-bigint_device_test_tests_modpow",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/modpow.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}
-
-rust_test_host {
-    name: "num-bigint_host_test_tests_roots",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
+    name: "num-bigint_test_tests_roots",
+    defaults: ["num-bigint_test_defaults"],
+    host_supported: true,
     srcs: [
         "tests/roots.rs",
         ":copy_num-bigint_build_out",
@@ -275,12 +219,3 @@
         unit_test: true,
     },
 }
-
-rust_test {
-    name: "num-bigint_device_test_tests_roots",
-    defaults: ["num-bigint_test_defaults_num_bigint"],
-    srcs: [
-        "tests/roots.rs",
-        ":copy_num-bigint_build_out",
-    ],
-}