diff options
author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:04:07 -0800 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:32:54 -0800 |
commit | 253e352847a1655e46a9556ec7a1da3f55c77c7c (patch) | |
tree | 48838dc03ac5a69b6aeb76dda6713be55a5e5fd6 | |
parent | 7bfffdb61c6f06a0cc9158476ebb3ed68f29e955 (diff) | |
download | lazy_static-253e352847a1655e46a9556ec7a1da3f55c77c7c.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Ie5620066a38dc70c56556d68718943943c8115aa
-rw-r--r-- | Android.bp | 46 | ||||
-rw-r--r-- | TEST_MAPPING | 127 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 67 insertions, 112 deletions
@@ -37,64 +37,29 @@ license { ], } -rust_defaults { - name: "lazy_static_test_defaults", - crate_name: "lazy_static", +rust_test { + name: "lazy_static_test_tests_test", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "lazy_static", cargo_env_compat: true, cargo_pkg_version: "1.4.0", + srcs: ["tests/test.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "lazy_static_host_test_src_lib", - defaults: ["lazy_static_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "lazy_static_device_test_src_lib", - defaults: ["lazy_static_test_defaults"], -} - -rust_defaults { - name: "lazy_static_test_defaults_lazy_static", - crate_name: "lazy_static", - // has rustc warnings - srcs: ["tests/test.rs"], - cargo_env_compat: true, - cargo_pkg_version: "1.4.0", - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2015", rustlibs: [ "liblazy_static", ], } -rust_test_host { - name: "lazy_static_host_test_tests_test", - defaults: ["lazy_static_test_defaults_lazy_static"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "lazy_static_device_test_tests_test", - defaults: ["lazy_static_test_defaults_lazy_static"], -} - rust_library { name: "liblazy_static", // has rustc warnings host_supported: true, - vendor_available: true, crate_name: "lazy_static", cargo_env_compat: true, cargo_pkg_version: "1.4.0", @@ -107,5 +72,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 8a6ab1e..0166f1d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,107 +1,123 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "android_logger_device_test_src_lib" + "path": "external/rust/crates/android_logger" }, { - "name": "android_logger_device_test_tests_config_log_level" + "path": "external/rust/crates/base64" }, { - "name": "android_logger_device_test_tests_default_init" + "path": "external/rust/crates/crossbeam-deque" }, { - "name": "android_logger_device_test_tests_multiple_init" + "path": "external/rust/crates/crossbeam-epoch" }, { - "name": "authfs_device_test_src_lib" + "path": "external/rust/crates/crossbeam-queue" }, { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/crossbeam-utils" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/jni" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/libsqlite3-sys" }, { - "name": "crossbeam-epoch_device_test_src_lib" + "path": "external/rust/crates/once_cell" }, { - "name": "crossbeam-epoch_device_test_tests_loom" + "path": "external/rust/crates/quiche" }, { - "name": "crossbeam-utils_device_test_src_lib" + "path": "external/rust/crates/regex" }, { - "name": "crossbeam-utils_device_test_tests_atomic_cell" + "path": "external/rust/crates/shared_library" }, { - "name": "crossbeam-utils_device_test_tests_cache_padded" + "path": "external/rust/crates/tinytemplate" }, { - "name": "crossbeam-utils_device_test_tests_parker" + "path": "external/rust/crates/tinyvec" }, { - "name": "crossbeam-utils_device_test_tests_sharded_lock" + "path": "external/rust/crates/unicode-xid" }, { - "name": "crossbeam-utils_device_test_tests_thread" + "path": "external/rust/crates/vulkano" }, { - "name": "crossbeam-utils_device_test_tests_wait_group" + "path": "external/rust/crates/xml-rs" + } + ], + "presubmit": [ + { + "name": "authfs_device_test_src_lib" }, { "name": "doh_unit_test" }, { - "name": "jni_device_test_src_lib" + "name": "keystore2_km_compat_test" + }, + { + "name": "keystore2_selinux_concurrency_test" + }, + { + "name": "keystore2_selinux_test" }, { - "name": "jni_device_test_tests_executor" + "name": "keystore2_test" }, { - "name": "jni_device_test_tests_executor_nested_attach" + "name": "keystore2_test_utils_test" }, { - "name": "jni_device_test_tests_java_integers" + "name": "lazy_static_test_tests_test" }, { - "name": "jni_device_test_tests_jmap" + "name": "legacykeystore_test" }, { - "name": "jni_device_test_tests_jni_api" + "name": "libapkverify.integration_test" }, { - "name": "jni_device_test_tests_jni_global_refs" + "name": "libapkverify.test" }, { - "name": "jni_device_test_tests_threads_attach_guard" + "name": "logger_device_unit_tests" }, { - "name": "jni_device_test_tests_threads_detach" + "name": "logger_test_config_log_level" }, { - "name": "jni_device_test_tests_threads_detach_daemon" + "name": "logger_test_default_init" }, { - "name": "jni_device_test_tests_threads_explicit_detach" + "name": "logger_test_env_log_level" }, { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" + "name": "logger_test_multiple_init" }, { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" + "name": "microdroid_manager_test" }, { - "name": "jni_device_test_tests_threads_nested_attach_daemon" + "name": "open_then_run_module" }, { - "name": "jni_device_test_tests_threads_nested_attach_guard" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "authfs_device_test_src_lib" }, { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "doh_unit_test" }, { "name": "keystore2_km_compat_test" @@ -116,10 +132,10 @@ "name": "keystore2_test" }, { - "name": "lazy_static_device_test_src_lib" + "name": "keystore2_test_utils_test" }, { - "name": "lazy_static_device_test_tests_test" + "name": "lazy_static_test_tests_test" }, { "name": "legacykeystore_test" @@ -131,55 +147,28 @@ "name": "libapkverify.test" }, { - "name": "libsqlite3-sys_device_test_src_lib" - }, - { - "name": "libsqlite3_bindgen_test" - }, - { - "name": "logger_device_test_config_log_level" + "name": "logger_device_unit_tests" }, { - "name": "logger_device_test_default_init" + "name": "logger_test_config_log_level" }, { - "name": "logger_device_test_env_log_level" + "name": "logger_test_default_init" }, { - "name": "logger_device_test_multiple_init" + "name": "logger_test_env_log_level" }, { - "name": "logger_device_unit_tests" + "name": "logger_test_multiple_init" }, { "name": "microdroid_manager_test" }, { - "name": "quiche_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_src_lib" - }, - { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "open_then_run_module" }, { "name": "virtualizationservice_device_test" - }, - { - "name": "xml-rs_device_test_src_analyze" - }, - { - "name": "xml-rs_device_test_src_lib" - }, - { - "name": "xml-rs_device_test_tests_event_reader" - }, - { - "name": "xml-rs_device_test_tests_event_writer" - }, - { - "name": "xml-rs_device_test_tests_streaming" } ] } diff --git a/cargo2android.json b/cargo2android.json index 63c1f22..9501f3b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -11,10 +11,10 @@ ], "device": true, "min-sdk-version": "29", - "vendor_available": true, "run": true, "test-blocklist": [ "tests/no_std.rs" ], - "tests": true -} + "tests": true, + "vendor-available": true +}
\ No newline at end of file |