Snap for 8730993 from a206c7063a70e092bee223112d4c769b1f6c0c4b 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: I8b6ea6b47b27414ace03c6cf8ba7a86219e606b5

3 files changed, 29 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index 3e1e487..70de83d 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 --test --features=std.
 
 package {
     default_applicable_licenses: [
@@ -39,14 +38,37 @@ license {
     ],
 }
 
+rust_defaults {
+    name: "fallible-streaming-iterator_defaults",
+    crate_name: "fallible_streaming_iterator",
+    // has rustc warnings
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "std",
+    ],
+}
+
+rust_test_host {
+    name: "fallible-streaming-iterator_host_test_src_lib",
+    defaults: ["fallible-streaming-iterator_defaults"],
+}
+
+rust_test {
+    name: "fallible-streaming-iterator_device_test_src_lib",
+    defaults: ["fallible-streaming-iterator_defaults"],
+}
+
 rust_library {
     name: "libfallible_streaming_iterator",
     // has rustc warnings
     host_supported: true,
     crate_name: "fallible_streaming_iterator",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.9",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    features: ["std"],
+    features: [
+        "std",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 91f37bf..3b7bc44 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,19 +1,8 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
 {
   "presubmit": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
+      "name": "fallible-streaming-iterator_device_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index fba20cf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "device": true,
-  "features": "std",
-  "run": true,
-  "tests": true
-}
\ No newline at end of file