Snap for 8730993 from f3d59dac3a61f953b285fd38a29797bc71d700b9 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: Ib4b4038e4d5faa5d2c404a39e60748ff0b6e610a

3 files changed, 1 insertions, 61 deletions

diff --git a/Android.bp b/Android.bp
index 3b59f16..04eb72b 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.
 
 package {
     default_applicable_licenses: ["external_rust_crates_termcolor_license"],
@@ -42,23 +41,6 @@ rust_library {
     name: "libtermcolor",
     host_supported: true,
     crate_name: "termcolor",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.1.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }
-
-rust_test {
-    name: "termcolor_test_src_lib",
-    host_supported: true,
-    crate_name: "termcolor",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.1.2",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2018",
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index f3742eb..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "presubmit": [
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "termcolor_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "termcolor_test_src_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