diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:38 +0000 |
commit | 91c9c1ee3ab5192e3406457ac40fa5c457834115 (patch) | |
tree | ce60cbf9c98add0e1123950b82f3bc0affe9f212 | |
parent | 9c8120fa6d50d6be704125daab7895cf5f028d68 (diff) | |
parent | 4c2401a3f96600a8db497e568abc3b22a8e85732 (diff) | |
download | getrandom-91c9c1ee3ab5192e3406457ac40fa5c457834115.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4c2401a3f9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/getrandom/+/1912603
Change-Id: I6a723af760ca22685ce2b24fb9843bd0ca6169b2
-rw-r--r-- | Android.bp | 70 | ||||
-rw-r--r-- | TEST_MAPPING | 235 |
2 files changed, 62 insertions, 243 deletions
@@ -37,12 +37,18 @@ license { ], } -rust_defaults { - name: "getrandom_defaults", +rust_test { + name: "getrandom_test_src_lib", + host_supported: true, crate_name: "getrandom", + cargo_env_compat: true, + cargo_pkg_version: "0.2.3", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: ["std"], rustlibs: [ @@ -51,22 +57,11 @@ rust_defaults { ], } -rust_test_host { - name: "getrandom_host_test_src_lib", - defaults: ["getrandom_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "getrandom_device_test_src_lib", - defaults: ["getrandom_defaults"], -} - rust_defaults { - name: "getrandom_defaults_getrandom", + name: "getrandom_test_defaults", crate_name: "getrandom", + cargo_env_compat: true, + cargo_pkg_version: "0.2.3", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -78,24 +73,10 @@ rust_defaults { ], } -rust_test_host { - name: "getrandom_host_test_tests_custom", - defaults: ["getrandom_defaults_getrandom"], - srcs: ["tests/custom.rs"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "getrandom_device_test_tests_custom", - defaults: ["getrandom_defaults_getrandom"], - srcs: ["tests/custom.rs"], -} - -rust_test_host { - name: "getrandom_host_test_tests_normal", - defaults: ["getrandom_defaults_getrandom"], + name: "getrandom_test_tests_normal", + defaults: ["getrandom_test_defaults"], + host_supported: true, srcs: ["tests/normal.rs"], test_options: { unit_test: true, @@ -103,30 +84,21 @@ rust_test_host { } rust_test { - name: "getrandom_device_test_tests_normal", - defaults: ["getrandom_defaults_getrandom"], - srcs: ["tests/normal.rs"], -} - -rust_test_host { - name: "getrandom_host_test_tests_rdrand", - defaults: ["getrandom_defaults_getrandom"], + name: "getrandom_test_tests_rdrand", + defaults: ["getrandom_test_defaults"], + host_supported: true, srcs: ["tests/rdrand.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "getrandom_device_test_tests_rdrand", - defaults: ["getrandom_defaults_getrandom"], - srcs: ["tests/rdrand.rs"], -} - rust_library { name: "libgetrandom", host_supported: true, crate_name: "getrandom", + cargo_env_compat: true, + cargo_pkg_version: "0.2.3", srcs: ["src/lib.rs"], edition: "2018", features: ["std"], @@ -139,7 +111,3 @@ rust_library { "com.android.virt", ], } - -// dependent_library ["feature_list"] -// cfg-if-1.0.0 -// libc-0.2.97 diff --git a/TEST_MAPPING b/TEST_MAPPING index b29c381..42e04b4 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,266 +1,117 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "apkdmverity.test" - }, - { - "name": "base64_device_test_tests_decode" - }, - { - "name": "base64_device_test_tests_encode" - }, - { - "name": "base64_device_test_tests_helpers" - }, - { - "name": "crossbeam-epoch_device_test_src_lib" - }, - { - "name": "crossbeam-epoch_device_test_tests_loom" - }, - { - "name": "crossbeam-utils_device_test_src_lib" - }, - { - "name": "crossbeam-utils_device_test_tests_atomic_cell" - }, - { - "name": "crossbeam-utils_device_test_tests_cache_padded" - }, - { - "name": "crossbeam-utils_device_test_tests_parker" - }, - { - "name": "crossbeam-utils_device_test_tests_sharded_lock" - }, - { - "name": "crossbeam-utils_device_test_tests_thread" - }, - { - "name": "crossbeam-utils_device_test_tests_wait_group" - }, - { - "name": "getrandom_device_test_src_lib" - }, - { - "name": "getrandom_device_test_tests_custom" - }, - { - "name": "getrandom_device_test_tests_normal" - }, - { - "name": "getrandom_device_test_tests_rdrand" - }, - { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "rand_core_device_test_src_lib" - }, - { - "name": "rand_xorshift_device_test_src_lib" - }, - { - "name": "rand_xorshift_device_test_tests_mod" - }, - { - "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": "tokio_device_test_tests_io_lines" - }, - { - "name": "tokio_device_test_tests_io_mem_stream" - }, - { - "name": "tokio_device_test_tests_io_read" - }, - { - "name": "tokio_device_test_tests_io_read_buf" - }, + "imports": [ { - "name": "tokio_device_test_tests_io_read_exact" + "path": "external/rust/crates/base64" }, { - "name": "tokio_device_test_tests_io_read_line" + "path": "external/rust/crates/cast" }, { - "name": "tokio_device_test_tests_io_read_to_end" + "path": "external/rust/crates/crc32fast" }, { - "name": "tokio_device_test_tests_io_read_to_string" + "path": "external/rust/crates/crossbeam-deque" }, { - "name": "tokio_device_test_tests_io_read_until" + "path": "external/rust/crates/crossbeam-epoch" }, { - "name": "tokio_device_test_tests_io_split" + "path": "external/rust/crates/crossbeam-queue" }, { - "name": "tokio_device_test_tests_io_take" + "path": "external/rust/crates/crossbeam-utils" }, { - "name": "tokio_device_test_tests_io_write" + "path": "external/rust/crates/mio" }, { - "name": "tokio_device_test_tests_io_write_all" + "path": "external/rust/crates/quickcheck" }, { - "name": "tokio_device_test_tests_io_write_buf" + "path": "external/rust/crates/rand_chacha" }, { - "name": "tokio_device_test_tests_io_write_int" + "path": "external/rust/crates/rand_core" }, { - "name": "tokio_device_test_tests_macros_join" + "path": "external/rust/crates/rand_xorshift" }, { - "name": "tokio_device_test_tests_macros_pin" + "path": "external/rust/crates/regex" }, { - "name": "tokio_device_test_tests_macros_select" + "path": "external/rust/crates/ryu" }, { - "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": "tokio_device_test_tests_sync_oneshot" - }, + "path": "external/rust/crates/tokio" + } + ], + "presubmit": [ { - "name": "tokio_device_test_tests_sync_rwlock" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_sync_semaphore" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_sync_semaphore_owned" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_sync_watch" + "name": "getrandom_test_src_lib" }, { - "name": "tokio_device_test_tests_task_abort" + "name": "getrandom_test_tests_normal" }, { - "name": "tokio_device_test_tests_task_blocking" + "name": "getrandom_test_tests_rdrand" }, { - "name": "tokio_device_test_tests_task_local" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_task_local_set" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_tcp_accept" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_tcp_connect" + "name": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_tcp_echo" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_tcp_into_split" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_tcp_into_std" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_tcp_peek" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_tcp_shutdown" + "name": "getrandom_test_src_lib" }, { - "name": "tokio_device_test_tests_tcp_socket" + "name": "getrandom_test_tests_normal" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "getrandom_test_tests_rdrand" }, { - "name": "tokio_device_test_tests_time_rt" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_udp" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "microdroid_manager_test" }, { "name": "virtualizationservice_device_test" |