diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:27:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:27:59 +0000 |
commit | d3a6baa591a726f3216df9e0cf4a8f3bb1a2f5f7 (patch) | |
tree | a0cc5d6d89f4ceaecf04e6b97fe55910e757ab9c | |
parent | fc6477acd87248f727f73c8cc50ad1c5376fda23 (diff) | |
parent | 3237b19ef5b727dde491af6425aa2c9420ece116 (diff) | |
download | log-android-s-v2-beta-3.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 289 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 58 insertions, 244 deletions
@@ -42,8 +42,9 @@ rust_library { stem: "liblog", // has rustc warnings host_supported: true, - vendor_available: true, crate_name: "log", + cargo_env_compat: true, + cargo_pkg_version: "0.4.14", srcs: ["src/lib.rs"], edition: "2015", features: ["std"], @@ -58,8 +59,6 @@ rust_library { "//apex_available:platform", "//apex_available:anyapex", ], + vendor_available: true, min_sdk_version: "29", } - -// dependent_library ["feature_list"] -// cfg-if-1.0.0 diff --git a/TEST_MAPPING b/TEST_MAPPING index 4fc1e98..fbe5bf8 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,95 +1,61 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "android_logger_device_test_src_lib" - }, - { - "name": "android_logger_device_test_tests_config_log_level" - }, - { - "name": "android_logger_device_test_tests_default_init" - }, - { - "name": "android_logger_device_test_tests_multiple_init" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "doh_unit_test" - }, - { - "name": "env_logger_device_test_src_lib" - }, + "imports": [ { - "name": "env_logger_device_test_tests_init-twice-retains-filter" + "path": "external/rust/crates/android_logger" }, { - "name": "env_logger_device_test_tests_log-in-log" + "path": "external/rust/crates/cast" }, { - "name": "env_logger_device_test_tests_log_tls_dtors" + "path": "external/rust/crates/crc32fast" }, { - "name": "env_logger_device_test_tests_regexp_filter" + "path": "external/rust/crates/env_logger" }, { - "name": "futures-util_device_test_src_lib" + "path": "external/rust/crates/futures-util" }, { - "name": "gdbstub_arch_device_test_src_lib" + "path": "external/rust/crates/gdbstub_arch" }, { - "name": "jni_device_test_src_lib" + "path": "external/rust/crates/jni" }, { - "name": "jni_device_test_tests_executor" + "path": "external/rust/crates/libsqlite3-sys" }, { - "name": "jni_device_test_tests_executor_nested_attach" + "path": "external/rust/crates/mio" }, { - "name": "jni_device_test_tests_java_integers" + "path": "external/rust/crates/quiche" }, { - "name": "jni_device_test_tests_jmap" + "path": "external/rust/crates/quickcheck" }, { - "name": "jni_device_test_tests_jni_api" + "path": "external/rust/crates/regex" }, { - "name": "jni_device_test_tests_jni_global_refs" + "path": "external/rust/crates/serde-xml-rs" }, { - "name": "jni_device_test_tests_threads_attach_guard" + "path": "external/rust/crates/tokio" }, { - "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" - }, + "path": "external/rust/crates/tokio-test" + } + ], + "presubmit": [ { - "name": "jni_device_test_tests_threads_nested_attach_daemon" + "name": "ZipFuseTest" }, { - "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" @@ -116,241 +82,90 @@ "name": "libapkverify.test" }, { - "name": "libsqlite3-sys_device_test_src_lib" - }, - { - "name": "libsqlite3_bindgen_test" - }, - { - "name": "logger_device_test_config_log_level" - }, - { - "name": "logger_device_test_default_init" - }, - { - "name": "logger_device_test_env_log_level" - }, - { - "name": "logger_device_test_multiple_init" - }, - { "name": "logger_device_unit_tests" }, { - "name": "microdroid_manager_test" - }, - { - "name": "quiche_device_test_src_lib" - }, - { - "name": "serde-xml-rs_device_test_src_lib" - }, - { - "name": "tokio-test_device_test_src_lib" - }, - { - "name": "tokio-test_device_test_tests_block_on" - }, - { - "name": "tokio-test_device_test_tests_io" - }, - { - "name": "tokio-test_device_test_tests_macros" - }, - { - "name": "tokio_device_test_tests__require_full" - }, - { - "name": "tokio_device_test_tests_buffered" - }, - { - "name": "tokio_device_test_tests_io_async_fd" - }, - { - "name": "tokio_device_test_tests_io_async_read" - }, - { - "name": "tokio_device_test_tests_io_chain" - }, - { - "name": "tokio_device_test_tests_io_copy" - }, - { - "name": "tokio_device_test_tests_io_copy_bidirectional" - }, - { - "name": "tokio_device_test_tests_io_driver" - }, - { - "name": "tokio_device_test_tests_io_driver_drop" + "name": "logger_test_config_log_level" }, { - "name": "tokio_device_test_tests_io_lines" + "name": "logger_test_default_init" }, { - "name": "tokio_device_test_tests_io_mem_stream" + "name": "logger_test_env_log_level" }, { - "name": "tokio_device_test_tests_io_read" + "name": "logger_test_multiple_init" }, { - "name": "tokio_device_test_tests_io_read_buf" - }, - { - "name": "tokio_device_test_tests_io_read_exact" - }, - { - "name": "tokio_device_test_tests_io_read_line" - }, - { - "name": "tokio_device_test_tests_io_read_to_end" - }, - { - "name": "tokio_device_test_tests_io_read_to_string" - }, - { - "name": "tokio_device_test_tests_io_read_until" - }, - { - "name": "tokio_device_test_tests_io_split" - }, - { - "name": "tokio_device_test_tests_io_take" - }, - { - "name": "tokio_device_test_tests_io_write" - }, - { - "name": "tokio_device_test_tests_io_write_all" - }, - { - "name": "tokio_device_test_tests_io_write_buf" - }, - { - "name": "tokio_device_test_tests_io_write_int" - }, - { - "name": "tokio_device_test_tests_macros_join" - }, - { - "name": "tokio_device_test_tests_macros_pin" - }, - { - "name": "tokio_device_test_tests_macros_select" - }, - { - "name": "tokio_device_test_tests_macros_test" - }, - { - "name": "tokio_device_test_tests_macros_try_join" - }, - { - "name": "tokio_device_test_tests_net_bind_resource" - }, - { - "name": "tokio_device_test_tests_net_lookup_host" - }, - { - "name": "tokio_device_test_tests_no_rt" - }, - { - "name": "tokio_device_test_tests_process_kill_on_drop" - }, - { - "name": "tokio_device_test_tests_rt_basic" - }, - { - "name": "tokio_device_test_tests_rt_common" - }, - { - "name": "tokio_device_test_tests_rt_threaded" - }, - { - "name": "tokio_device_test_tests_sync_barrier" - }, - { - "name": "tokio_device_test_tests_sync_broadcast" - }, - { - "name": "tokio_device_test_tests_sync_errors" - }, - { - "name": "tokio_device_test_tests_sync_mpsc" - }, - { - "name": "tokio_device_test_tests_sync_mutex" - }, - { - "name": "tokio_device_test_tests_sync_mutex_owned" - }, - { - "name": "tokio_device_test_tests_sync_notify" + "name": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_sync_oneshot" + "name": "open_then_run_module" }, { - "name": "tokio_device_test_tests_sync_rwlock" + "name": "rustBinderTest" }, { - "name": "tokio_device_test_tests_sync_semaphore" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_sync_semaphore_owned" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_sync_watch" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_task_abort" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_task_blocking" + "name": "keystore2_crypto_test_rust" }, { - "name": "tokio_device_test_tests_task_local" + "name": "keystore2_selinux_concurrency_test" }, { - "name": "tokio_device_test_tests_task_local_set" + "name": "keystore2_selinux_test" }, { - "name": "tokio_device_test_tests_tcp_accept" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_tcp_connect" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_tcp_echo" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_tcp_into_split" + "name": "libapkverify.integration_test" }, { - "name": "tokio_device_test_tests_tcp_into_std" + "name": "libapkverify.test" }, { - "name": "tokio_device_test_tests_tcp_peek" + "name": "logger_device_unit_tests" }, { - "name": "tokio_device_test_tests_tcp_shutdown" + "name": "logger_test_config_log_level" }, { - "name": "tokio_device_test_tests_tcp_socket" + "name": "logger_test_default_init" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "logger_test_env_log_level" }, { - "name": "tokio_device_test_tests_time_rt" + "name": "logger_test_multiple_init" }, { - "name": "tokio_device_test_tests_udp" + "name": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "open_then_run_module" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "rustBinderTest" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 49c09cb..11f62b6 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,9 +4,9 @@ "//apex_available:anyapex" ], "dependencies": true, - "vendor_available": true, "device": true, "features": "std", "min-sdk-version": "29", - "run": true -} + "run": true, + "vendor-available": true +}
\ No newline at end of file |