diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:23 +0000 |
commit | 3502d8f929e355eb1e20fa3c4d7c599d65661feb (patch) | |
tree | 5e61255fa55fb78e3fce769126bd2df8be6f1d46 | |
parent | d98ee88d429b56b23ba6ab3a0c7fb69d84219409 (diff) | |
parent | a709533e906b6b961fdda0b9034e44eb7aeab542 (diff) | |
download | thiserror-3502d8f929e355eb1e20fa3c4d7c599d65661feb.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 7de455226b am: a709533e90
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror/+/1912818
Change-Id: I68884c96fd7400b37582bf0bfb54aa164a9d6542
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | TEST_MAPPING | 80 | ||||
-rw-r--r-- | cargo2android.json | 8 |
3 files changed, 35 insertions, 55 deletions
@@ -40,7 +40,6 @@ license { 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 @@ rust_library { "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,44 +1,19 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "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" - }, + "imports": [ { - "name": "anyhow_device_test_tests_test_fmt" + "path": "external/rust/crates/anyhow" }, { - "name": "anyhow_device_test_tests_test_macros" + "path": "external/rust/crates/jni" }, { - "name": "anyhow_device_test_tests_test_repr" - }, + "path": "external/rust/crates/serde-xml-rs" + } + ], + "presubmit": [ { - "name": "anyhow_device_test_tests_test_source" + "name": "ZipFuseTest" }, { "name": "apkdmverity.test" @@ -47,52 +22,57 @@ "name": "authfs_device_test_src_lib" }, { - "name": "jni_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "jni_device_test_tests_executor" + "name": "keystore2_crypto_test_rust" }, { - "name": "jni_device_test_tests_executor_nested_attach" + "name": "keystore2_selinux_concurrency_test" }, { - "name": "jni_device_test_tests_java_integers" + "name": "keystore2_selinux_test" }, { - "name": "jni_device_test_tests_jmap" + "name": "keystore2_test" }, { - "name": "jni_device_test_tests_jni_api" + "name": "keystore2_test_utils_test" }, { - "name": "jni_device_test_tests_jni_global_refs" + "name": "keystore2_vintf_test" }, { - "name": "jni_device_test_tests_threads_attach_guard" + "name": "legacykeystore_test" }, { - "name": "jni_device_test_tests_threads_detach" + "name": "libapkverify.integration_test" }, { - "name": "jni_device_test_tests_threads_detach_daemon" + "name": "libapkverify.test" }, { - "name": "jni_device_test_tests_threads_explicit_detach" + "name": "microdroid_manager_test" }, { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" + "name": "open_then_run_module" }, { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" }, { - "name": "jni_device_test_tests_threads_nested_attach_daemon" + "name": "apkdmverity.test" }, { - "name": "jni_device_test_tests_threads_nested_attach_guard" + "name": "authfs_device_test_src_lib" }, { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "doh_unit_test" }, { "name": "keystore2_crypto_test_rust" @@ -125,7 +105,7 @@ "name": "microdroid_manager_test" }, { - "name": "serde-xml-rs_device_test_src_lib" + "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 |