Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I6eca8ca4b9bd5497d5b95df97d639f91ab2ff1b3

3 files changed, 143 insertions, 131 deletions

diff --git a/Android.bp b/Android.bp
index 2093ac9..1e3dad1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,41 +37,31 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "anyhow_test_defaults",
+rust_test {
+    name: "anyhow_test_src_lib",
+    host_supported: true,
     crate_name: "anyhow",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.44",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
         "std",
     ],
-    cfgs: ["backtrace"],
     rustlibs: [
         "libfutures",
         "libthiserror",
     ],
 }
 
-rust_test_host {
-    name: "anyhow_host_test_src_lib",
-    defaults: ["anyhow_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "anyhow_device_test_src_lib",
-    defaults: ["anyhow_test_defaults"],
-}
-
 rust_defaults {
-    name: "anyhow_test_defaults_anyhow",
+    name: "anyhow_test_defaults",
     crate_name: "anyhow",
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.44",
@@ -82,7 +72,6 @@ rust_defaults {
         "default",
         "std",
     ],
-    cfgs: ["backtrace"],
     rustlibs: [
         "libanyhow",
         "libfutures",
@@ -90,114 +79,70 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "anyhow_host_test_tests_test_autotrait",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_autotrait.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "anyhow_device_test_tests_test_autotrait",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_autotrait",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_autotrait.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_boxed",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_boxed.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_boxed",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_boxed",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_boxed.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_chain",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_chain.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_chain",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_chain",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_chain.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_context",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_context.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_context",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_context",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_context.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_convert",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_convert.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_convert",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_convert",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_convert.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_downcast",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_downcast.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_downcast",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_downcast",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_downcast.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_ffi",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_ffi.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_ffi",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_ffi.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_fmt",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_fmt",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_fmt.rs"],
     test_options: {
         unit_test: true,
@@ -205,14 +150,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_fmt",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_fmt.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_macros",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_macros",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_macros.rs"],
     test_options: {
         unit_test: true,
@@ -220,14 +160,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_macros",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_macros.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_repr",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_repr",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_repr.rs"],
     test_options: {
         unit_test: true,
@@ -235,26 +170,15 @@ rust_test_host {
 }
 
 rust_test {
-    name: "anyhow_device_test_tests_test_repr",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_repr.rs"],
-}
-
-rust_test_host {
-    name: "anyhow_host_test_tests_test_source",
-    defaults: ["anyhow_test_defaults_anyhow"],
+    name: "anyhow_test_tests_test_source",
+    defaults: ["anyhow_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_source.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "anyhow_device_test_tests_test_source",
-    defaults: ["anyhow_test_defaults_anyhow"],
-    srcs: ["tests/test_source.rs"],
-}
-
 rust_library {
     name: "libanyhow",
     host_supported: true,
@@ -267,7 +191,6 @@ rust_library {
         "default",
         "std",
     ],
-    cfgs: ["backtrace"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b39287a..cb65989 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,40 +5,120 @@
       "name": "ZipFuseTest"
     },
     {
-      "name": "anyhow_device_test_src_lib"
+      "name": "anyhow_test_src_lib"
     },
     {
-      "name": "anyhow_device_test_tests_test_autotrait"
+      "name": "anyhow_test_tests_test_autotrait"
     },
     {
-      "name": "anyhow_device_test_tests_test_boxed"
+      "name": "anyhow_test_tests_test_boxed"
     },
     {
-      "name": "anyhow_device_test_tests_test_chain"
+      "name": "anyhow_test_tests_test_chain"
     },
     {
-      "name": "anyhow_device_test_tests_test_context"
+      "name": "anyhow_test_tests_test_context"
     },
     {
-      "name": "anyhow_device_test_tests_test_convert"
+      "name": "anyhow_test_tests_test_convert"
     },
     {
-      "name": "anyhow_device_test_tests_test_downcast"
+      "name": "anyhow_test_tests_test_downcast"
     },
     {
-      "name": "anyhow_device_test_tests_test_ffi"
+      "name": "anyhow_test_tests_test_fmt"
     },
     {
-      "name": "anyhow_device_test_tests_test_fmt"
+      "name": "anyhow_test_tests_test_macros"
     },
     {
-      "name": "anyhow_device_test_tests_test_macros"
+      "name": "anyhow_test_tests_test_repr"
     },
     {
-      "name": "anyhow_device_test_tests_test_repr"
+      "name": "anyhow_test_tests_test_source"
     },
     {
-      "name": "anyhow_device_test_tests_test_source"
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "doh_unit_test"
+    },
+    {
+      "name": "keystore2_selinux_concurrency_test"
+    },
+    {
+      "name": "keystore2_selinux_test"
+    },
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_test_utils_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libidsig.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "open_then_run_module"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "anyhow_test_src_lib"
+    },
+    {
+      "name": "anyhow_test_tests_test_autotrait"
+    },
+    {
+      "name": "anyhow_test_tests_test_boxed"
+    },
+    {
+      "name": "anyhow_test_tests_test_chain"
+    },
+    {
+      "name": "anyhow_test_tests_test_context"
+    },
+    {
+      "name": "anyhow_test_tests_test_convert"
+    },
+    {
+      "name": "anyhow_test_tests_test_downcast"
+    },
+    {
+      "name": "anyhow_test_tests_test_fmt"
+    },
+    {
+      "name": "anyhow_test_tests_test_macros"
+    },
+    {
+      "name": "anyhow_test_tests_test_repr"
+    },
+    {
+      "name": "anyhow_test_tests_test_source"
     },
     {
       "name": "apkdmverity.test"
@@ -59,6 +139,12 @@
       "name": "keystore2_test"
     },
     {
+      "name": "keystore2_test_utils_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
       "name": "legacykeystore_test"
     },
     {
@@ -74,6 +160,9 @@
       "name": "microdroid_manager_test"
     },
     {
+      "name": "open_then_run_module"
+    },
+    {
       "name": "virtualizationservice_device_test"
     }
   ]
diff --git a/cargo2android.json b/cargo2android.json
index 3d540c9..63411fd 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,8 +6,6 @@
     "com.android.uwb",
     "com.android.virt"
   ],
-  "min_sdk_version": "29",
-  "vendor_available": true,
   "dependencies": true,
   "dependency-blocklist": [
     "rustversion",
@@ -15,10 +13,12 @@
     "trybuild"
   ],
   "device": true,
+  "min-sdk-version": "29",
   "run": true,
   "test-blocklist": [
     "tests/compiletest.rs",
     "tests/test_backtrace.rs"
   ],
-  "tests": true
-}
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file