diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:49 +0000 |
commit | a6afd5ba403dcec493bb5636963db2b9ad97eb0f (patch) | |
tree | bd4cc982e6d33eb6ed317722db6174eedfd97fb1 | |
parent | 7b7b971325d2294c78da7558096924346d253463 (diff) | |
parent | deafa1d4989bbe6061b780885ade62eb44d1c3f1 (diff) | |
download | tokio-macros-a6afd5ba403dcec493bb5636963db2b9ad97eb0f.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 20d7bce817 am: deafa1d498
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1912417
Change-Id: I8db289168e7702af1759d8785a38b1d8c18926df
-rw-r--r-- | Android.bp | 22 | ||||
-rw-r--r-- | TEST_MAPPING | 216 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 19 insertions, 223 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -31,23 +31,3 @@ rust_proc_macro { "libsyn", ], } - -rust_test_host { - name: "tokio-macros_host_test_src_lib", - crate_name: "tokio_macros", - cargo_env_compat: true, - cargo_pkg_version: "1.4.1", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - test_options: { - unit_test: true, - }, - edition: "2018", - rustlibs: [ - "libproc_macro2", - "libquote", - "libsyn", - "libtokio", - ], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 6c266ef..de9aee1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,218 +1,30 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "doh_unit_test" - }, - { - "name": "futures-util_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" - }, + "imports": [ { - "name": "tokio_device_test_tests_io_async_fd" + "path": "external/rust/crates/futures-util" }, { - "name": "tokio_device_test_tests_io_async_read" + "path": "external/rust/crates/tokio" }, { - "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" - }, - { - "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": "tokio_device_test_tests_sync_oneshot" - }, - { - "name": "tokio_device_test_tests_sync_rwlock" - }, - { - "name": "tokio_device_test_tests_sync_semaphore" - }, - { - "name": "tokio_device_test_tests_sync_semaphore_owned" - }, - { - "name": "tokio_device_test_tests_sync_watch" - }, - { - "name": "tokio_device_test_tests_task_abort" - }, - { - "name": "tokio_device_test_tests_task_blocking" - }, - { - "name": "tokio_device_test_tests_task_local" - }, - { - "name": "tokio_device_test_tests_task_local_set" - }, - { - "name": "tokio_device_test_tests_tcp_accept" - }, - { - "name": "tokio_device_test_tests_tcp_connect" - }, - { - "name": "tokio_device_test_tests_tcp_echo" - }, - { - "name": "tokio_device_test_tests_tcp_into_split" - }, - { - "name": "tokio_device_test_tests_tcp_into_std" - }, - { - "name": "tokio_device_test_tests_tcp_peek" - }, - { - "name": "tokio_device_test_tests_tcp_shutdown" - }, - { - "name": "tokio_device_test_tests_tcp_socket" - }, - { - "name": "tokio_device_test_tests_tcp_split" - }, + "path": "external/rust/crates/tokio-test" + } + ], + "presubmit": [ { - "name": "tokio_device_test_tests_time_rt" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_udp" - }, + "name": "rustBinderTest" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_uds_cred" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "rustBinderTest" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..341300b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "run": true, + "tests": true +}
\ No newline at end of file |