Snap for 8730993 from 10dd75206e3b45bb20aa13e9427f29c4d05d9a4c to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I7b991ad717fc910fce700b37cd8b4d58d7fd08c5

3 files changed, 37 insertions, 108 deletions

diff --git a/Android.bp b/Android.bp
index e712fd7..4a33246 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,8 +41,6 @@ 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: [
@@ -55,27 +53,16 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
-        "com.android.uwb",
         "com.android.virt",
     ],
-    vendor_available: true,
-    min_sdk_version: "29",
 }
 
-rust_test {
-    name: "num-traits_test_src_lib",
-    host_supported: true,
+rust_defaults {
+    name: "num-traits_defaults",
     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",
@@ -87,18 +74,25 @@ rust_test {
     ],
 }
 
+rust_test_host {
+    name: "num-traits_host_test_src_lib",
+    defaults: ["num-traits_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
 rust_test {
-    name: "num-traits_test_tests_cast",
-    host_supported: true,
+    name: "num-traits_device_test_src_lib",
+    defaults: ["num-traits_defaults"],
+}
+
+rust_defaults {
+    name: "num-traits_defaults_cast",
     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",
@@ -112,3 +106,19 @@ rust_test {
         "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 cb7008a..aa4ba0b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,87 +1,11 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
 {
-  "imports": [
-    {
-      "path": "external/rust/crates/base64"
-    },
-    {
-      "path": "external/rust/crates/gdbstub_arch"
-    },
-    {
-      "path": "external/rust/crates/num-bigint"
-    },
-    {
-      "path": "external/rust/crates/num-integer"
-    },
-    {
-      "path": "external/rust/crates/oid-registry"
-    },
-    {
-      "path": "external/rust/crates/tinytemplate"
-    },
-    {
-      "path": "external/rust/crates/tinyvec"
-    },
-    {
-      "path": "external/rust/crates/unicode-xid"
-    }
-  ],
   "presubmit": [
     {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libcert_request_validator_tests"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "num-traits_test_src_lib"
-    },
-    {
-      "name": "num-traits_test_tests_cast"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libcert_request_validator_tests"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "num-traits_test_src_lib"
-    },
-    {
-      "name": "num-traits_test_tests_cast"
+      "name": "num-traits_device_test_src_lib"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "num-traits_device_test_tests_cast"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index f7c1ca1..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,15 +1,10 @@
 {
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.uwb",
     "com.android.virt"
   ],
   "dependencies": true,
   "device": true,
-  "min-sdk-version": "29",
   "run": true,
-  "tests": true,
-  "vendor-available": true
-}
+  "tests": true
+}
\ No newline at end of file