Snap for 8730993 from 74ff1c93e36cb981f6fa0fe1e8e50fbabe2db89f 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: I101dfaec008db824ef877923f943dc613f0802c1

3 files changed, 16 insertions, 33 deletions

diff --git a/Android.bp b/Android.bp
index 45a10df..8d953db 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 --run --device --dependencies --tests.
 
 package {
     default_applicable_licenses: ["external_rust_crates_bencher_license"],
@@ -37,29 +36,31 @@ license {
     ],
 }
 
-rust_test {
-    name: "bencher_test_lib",
-    // has rustc warnings
-    host_supported: true,
+rust_defaults {
+    name: "bencher_defaults",
     crate_name: "bencher",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.5",
+    // has rustc warnings
     srcs: ["lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
     edition: "2015",
 }
 
+rust_test_host {
+    name: "bencher_host_test_lib",
+    defaults: ["bencher_defaults"],
+}
+
+rust_test {
+    name: "bencher_device_test_lib",
+    defaults: ["bencher_defaults"],
+}
+
 rust_library {
     name: "libbencher",
     // has rustc warnings
     host_supported: true,
     crate_name: "bencher",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.5",
     srcs: ["lib.rs"],
     edition: "2015",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6ea76c5..689a71b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,21 +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/crc32fast"
-    },
-    {
-      "path": "external/rust/crates/url"
-    }
-  ],
   "presubmit": [
     {
-      "name": "bencher_test_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "bencher_test_lib"
+      "name": "bencher_device_test_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file