Snap for 8730993 from 661839d15234a38d1db1aa2da52d5766cf130f53 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: I3fe36fd1f9d43c612309a3979a02a6e3accb0861

3 files changed, 4 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index 70e0e91..afd83ab 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --run --device --dependencies.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,11 +22,12 @@ rust_library {
     name: "libatty",
     host_supported: true,
     crate_name: "atty",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.2.14",
     srcs: ["src/lib.rs"],
     edition: "2015",
     rustlibs: [
         "liblibc",
     ],
 }
+
+// dependent_library ["feature_list"]
+//   libc-0.2.88
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 3cbd48d..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "imports": [
-    {
-      "path": "external/rust/crates/base64"
-    },
-    {
-      "path": "external/rust/crates/tinytemplate"
-    },
-    {
-      "path": "external/rust/crates/tinyvec"
-    },
-    {
-      "path": "external/rust/crates/unicode-xid"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "device": true,
-  "run": true
-}
\ No newline at end of file