Snap for 8730993 from 767a426825792aabb65a33de29fad3acd703dccd 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: I6a90f2399d473f3897e18cdd80d84eefa6c0b40b

3 files changed, 15 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index 585f0bc..af8bfb3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --device --run --dependencies --tests.
 
 package {
     default_applicable_licenses: ["external_rust_crates_fnv_license"],
@@ -37,18 +36,12 @@ license {
     ],
 }
 
-rust_test {
-    name: "fnv_test_lib",
-    host_supported: true,
+rust_defaults {
+    name: "fnv_defaults",
     crate_name: "fnv",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.7",
     srcs: ["lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
     edition: "2015",
     features: [
         "default",
@@ -56,20 +49,24 @@ rust_test {
     ],
 }
 
+rust_test_host {
+    name: "fnv_host_test_lib",
+    defaults: ["fnv_defaults"],
+}
+
+rust_test {
+    name: "fnv_device_test_lib",
+    defaults: ["fnv_defaults"],
+}
+
 rust_library {
     name: "libfnv",
     host_supported: true,
     crate_name: "fnv",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.7",
     srcs: ["lib.rs"],
     edition: "2015",
     features: [
         "default",
         "std",
     ],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4c0b38e..30d2306 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,18 +1,8 @@
-// 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/vulkano"
-    }
-  ],
   "presubmit": [
     {
-      "name": "fnv_test_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "fnv_test_lib"
+      "name": "fnv_device_test_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e516e0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file