From 568133c41b7eb095793378406431dbc1be1f4b15 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:03:35 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Icb4b3c7db2128a1ecb77f34984bfd57a8495a893
---
 Android.bp         | 34 +++++++++++++---------------------
 TEST_MAPPING       | 33 +++++++++++++++++++++++----------
 cargo2android.json |  5 +++++
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 cargo2android.json

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
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 359e921..149c80f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,35 +1,48 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "apkdmverity.test"
     },
     {
-      "name": "either_device_test_src_lib"
+      "name": "either_test_src_lib"
     },
     {
       "name": "keystore2_test"
     },
     {
       "name": "legacykeystore_test"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "either_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "keystore2_test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "legacykeystore_test"
     }
   ]
 }
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
-- 
cgit v1.2.3