Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I954093a944346dce755a412791a36f80b897a8ba

3 files changed, 26 insertions, 35 deletions

diff --git a/Android.bp b/Android.bp
index 3d4064e..ad8f3c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --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,33 +37,24 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "cast_test_defaults",
+rust_test {
+    name: "cast_test_src_lib",
+    host_supported: true,
     crate_name: "cast",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.0",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libquickcheck",
     ],
 }
 
-rust_test_host {
-    name: "cast_host_test_src_lib",
-    defaults: ["cast_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "cast_device_test_src_lib",
-    defaults: ["cast_test_defaults"],
-}
-
 rust_library {
     name: "libcast",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4410288..209b12d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,32 +1,27 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
+  "imports": [
     {
-      "name": "cast_device_test_src_lib"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "tinytemplate_device_test_src_lib"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "tinyvec_device_test_tests_arrayvec"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "tinyvec_device_test_tests_tinyvec"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "unicode-xid_device_test_src_lib"
-    },
+      "name": "cast_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "cast_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file