Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Icb4b3c7db2128a1ecb77f34984bfd57a8495a893

1 files changed, 13 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index 12d9f35..1cbd146 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -37,12 +37,18 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "either_defaults",
+rust_test {
+    name: "either_test_src_lib",
+    host_supported: true,
     crate_name: "either",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.1",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -53,23 +59,12 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "either_host_test_src_lib",
-    defaults: ["either_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "either_device_test_src_lib",
-    defaults: ["either_defaults"],
-}
-
 rust_library {
     name: "libeither",
     host_supported: true,
     crate_name: "either",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -78,8 +73,5 @@ rust_library {
     ],
 }
 
-// dependent_library ["feature_list"]
-//   itoa-0.4.7
-//   ryu-1.0.5
-//   serde-1.0.123 "std"
-//   serde_json-1.0.64 "default,std"
+//Non fatal errors:
+// error: test