Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Iec1c814f18a0c84fe2d5d9f6b88fc6d5496f7fa6
diff --git a/Android.bp b/Android.bp
index 226e160..cc2e6d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,6 @@
rust_library {
name: "libthiserror",
host_supported: true,
- vendor_available: true,
crate_name: "thiserror",
cargo_env_compat: true,
cargo_pkg_version: "1.0.29",
@@ -54,5 +53,6 @@
"com.android.uwb",
"com.android.virt",
],
+ vendor_available: true,
min_sdk_version: "29",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 35b2201..ec89789 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,98 +1,28 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/anyhow"
+ },
+ {
+ "path": "external/rust/crates/jni"
+ },
+ {
+ "path": "external/rust/crates/serde-xml-rs"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
},
{
- "name": "anyhow_device_test_src_lib"
- },
- {
- "name": "anyhow_device_test_tests_test_autotrait"
- },
- {
- "name": "anyhow_device_test_tests_test_boxed"
- },
- {
- "name": "anyhow_device_test_tests_test_chain"
- },
- {
- "name": "anyhow_device_test_tests_test_context"
- },
- {
- "name": "anyhow_device_test_tests_test_convert"
- },
- {
- "name": "anyhow_device_test_tests_test_downcast"
- },
- {
- "name": "anyhow_device_test_tests_test_ffi"
- },
- {
- "name": "anyhow_device_test_tests_test_fmt"
- },
- {
- "name": "anyhow_device_test_tests_test_macros"
- },
- {
- "name": "anyhow_device_test_tests_test_repr"
- },
- {
- "name": "anyhow_device_test_tests_test_source"
- },
- {
"name": "apkdmverity.test"
},
{
"name": "authfs_device_test_src_lib"
},
{
- "name": "jni_device_test_src_lib"
- },
- {
- "name": "jni_device_test_tests_executor"
- },
- {
- "name": "jni_device_test_tests_executor_nested_attach"
- },
- {
- "name": "jni_device_test_tests_java_integers"
- },
- {
- "name": "jni_device_test_tests_jmap"
- },
- {
- "name": "jni_device_test_tests_jni_api"
- },
- {
- "name": "jni_device_test_tests_jni_global_refs"
- },
- {
- "name": "jni_device_test_tests_threads_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_detach"
- },
- {
- "name": "jni_device_test_tests_threads_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_permanent"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_permanently"
+ "name": "doh_unit_test"
},
{
"name": "keystore2_crypto_test_rust"
@@ -125,7 +55,57 @@
"name": "microdroid_manager_test"
},
{
- "name": "serde-xml-rs_device_test_src_lib"
+ "name": "open_then_run_module"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
+ "name": "keystore2_crypto_test_rust"
+ },
+ {
+ "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": "microdroid_manager_test"
+ },
+ {
+ "name": "open_then_run_module"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 8d63324..968e19b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,7 +8,7 @@
],
"dependencies": true,
"device": true,
- "min_sdk_version": "29",
- "vendor_available": true,
- "run": true
-}
+ "min-sdk-version": "29",
+ "run": true,
+ "vendor-available": true
+}
\ No newline at end of file