Enable tests in Android CI am: 55a8a49666 am: db1e707d1e am: 4635d8718a am: 61f4bdc7b1

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arbitrary/+/1859216

Change-Id: Id1eee07514dc1953a9cf0b9697a663bd08de7123

3 files changed, 94 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 16816a1..bdf5cd6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,83 @@ license {
     ],
 }
 
+rust_defaults {
+    name: "arbitrary_test_defaults",
+    crate_name: "arbitrary",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.2",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "derive",
+        "derive_arbitrary",
+    ],
+    proc_macros: ["libderive_arbitrary"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_src_lib",
+    defaults: ["arbitrary_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_src_lib",
+    defaults: ["arbitrary_test_defaults"],
+}
+
+rust_defaults {
+    name: "arbitrary_test_defaults_arbitrary",
+    crate_name: "arbitrary",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.2",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "derive",
+        "derive_arbitrary",
+    ],
+    rustlibs: [
+        "libarbitrary",
+    ],
+    proc_macros: ["libderive_arbitrary"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_tests_derive",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/derive.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_tests_derive",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/derive.rs"],
+}
+
+rust_test_host {
+    name: "arbitrary_host_test_tests_path",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/path.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "arbitrary_device_test_tests_path",
+    defaults: ["arbitrary_test_defaults_arbitrary"],
+    srcs: ["tests/path.rs"],
+}
+
 rust_library_rlib {
     name: "libarbitrary",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..75be883
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,14 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "arbitrary_device_test_src_lib"
+    },
+    {
+      "name": "arbitrary_device_test_tests_derive"
+    },
+    {
+      "name": "arbitrary_device_test_tests_path"
+    }
+  ]
+}
diff --git a/cargo2android.json b/cargo2android.json
index af31ee9..c586b5e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,5 +3,6 @@
   "device": true,
   "features": "derive",
   "force-rlib": true,
-  "run": true
-}
\ No newline at end of file
+  "run": true,
+  "tests": true
+}