Snap for 6877830 from 8bb794694f8afe0ce1067526e5b35e0e42a05f4d to sdk-release

Change-Id: I801ab9e618c6b2c8632d96ca60958f6843fc9574
diff --git a/Android.bp b/Android.bp
index bd48ce1..d980847 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,27 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+
+rust_defaults {
+    name: "futures-io_defaults",
+    crate_name: "futures_io",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+}
+
+rust_test_host {
+    name: "futures-io_host_test_src_lib",
+    defaults: ["futures-io_defaults"],
+}
+
+rust_test {
+    name: "futures-io_device_test_src_lib",
+    defaults: ["futures-io_defaults"],
+}
 
 rust_library {
     name: "libfutures_io",
diff --git a/METADATA b/METADATA
index 370b021..17e5d7a 100644
--- a/METADATA
+++ b/METADATA
@@ -6,8 +6,8 @@
     value: "https://crates.io/crates/futures-io"
   }
   url {
-    type: GIT
-    value: "https://github.com/rust-lang/futures-rs"
+    type: ARCHIVE
+    value: "https://static.crates.io/crates/futures-io/futures-io-0.3.5.crate"
   }
   version: "0.3.5"
   license_type: NOTICE
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..cf100e2
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "futures-io_host_test_src_lib",
+      "host": true
+    },
+    {
+      "name": "futures-io_device_test_src_lib"
+    }
+  ]
+}