Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I9ced66cd88d4aca7f4a7327eba594542990629ad

3 files changed, 49 insertions, 57 deletions

diff --git a/Android.bp b/Android.bp
index 8bf649d..8cbc204 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ rust_library {
     name: "libnum_traits",
     host_supported: true,
     crate_name: "num_traits",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.14",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -60,12 +62,18 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "num-traits_defaults",
+rust_test {
+    name: "num-traits_test_src_lib",
+    host_supported: true,
     crate_name: "num_traits",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.14",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -77,25 +85,18 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "num-traits_host_test_src_lib",
-    defaults: ["num-traits_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "num-traits_device_test_src_lib",
-    defaults: ["num-traits_defaults"],
-}
-
-rust_defaults {
-    name: "num-traits_defaults_cast",
+    name: "num-traits_test_tests_cast",
+    host_supported: true,
     crate_name: "cast",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.14",
     srcs: ["tests/cast.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -109,19 +110,3 @@ rust_defaults {
         "libnum_traits",
     ],
 }
-
-rust_test_host {
-    name: "num-traits_host_test_tests_cast",
-    defaults: ["num-traits_defaults_cast"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "num-traits_device_test_tests_cast",
-    defaults: ["num-traits_defaults_cast"],
-}
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 163c17e..3250256 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,71 +1,78 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "apkdmverity.test"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/gdbstub_arch"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/num-bigint"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/num-integer"
     },
     {
-      "name": "gdbstub_arch_device_test_src_lib"
+      "path": "external/rust/crates/oid-registry"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "libapkverify.test"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "libidsig.test"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "microdroid_manager_test"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "num-bigint_device_test_src_lib"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint"
+      "name": "libapkverify.test"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint_bitwise"
+      "name": "libidsig.test"
     },
     {
-      "name": "num-bigint_device_test_tests_bigint_scalar"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "num-bigint_device_test_tests_biguint"
+      "name": "num-traits_test_src_lib"
     },
     {
-      "name": "num-bigint_device_test_tests_biguint_scalar"
+      "name": "num-traits_test_tests_cast"
     },
     {
-      "name": "num-bigint_device_test_tests_modpow"
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "apkdmverity.test"
     },
     {
-      "name": "num-bigint_device_test_tests_roots"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "num-traits_device_test_src_lib"
+      "name": "libapkverify.test"
     },
     {
-      "name": "num-traits_device_test_tests_cast"
+      "name": "libidsig.test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "num-traits_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "num-traits_test_tests_cast"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 95f150b..9a21b76 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,4 +10,4 @@
   "min_sdk_version": "29",
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file