Snap for 8562061 from b2486ad9e829b8b175ed96970ccc41d7167b748f to mainline-media-release

Change-Id: I85b4ff95c7989f3c5900bcadbe92164cc3142420
diff --git a/Android.bp b/Android.bp
index afd83ab..70e0e91 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,12 +22,11 @@
     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
new file mode 100644
index 0000000..3cbd48d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+// 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
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file