From 82d53a845bb388c06e173918b280033c7a2ab17c Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:05:45 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: I17897024dfbe812439a43cb226853e1794a30907 --- Android.bp | 109 ++++----------------------- TEST_MAPPING | 210 ++++------------------------------------------------- cargo2android.json | 5 ++ 3 files changed, 35 insertions(+), 289 deletions(-) create mode 100644 cargo2android.json diff --git a/Android.bp b/Android.bp index 44a3cf7..43cb97d 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,6 +22,8 @@ rust_library { name: "libtokio_test", host_supported: true, crate_name: "tokio_test", + cargo_env_compat: true, + cargo_pkg_version: "0.4.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -34,38 +36,10 @@ rust_library { } rust_defaults { - name: "tokio-test_defaults", - crate_name: "tokio_test", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - rustlibs: [ - "libasync_stream", - "libbytes", - "libfutures_core", - "libfutures_util", - "libtokio", - "libtokio_stream", - ], -} - -rust_test_host { - name: "tokio-test_host_test_src_lib", - defaults: ["tokio-test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "tokio-test_device_test_src_lib", - defaults: ["tokio-test_defaults"], -} - -rust_defaults { - name: "tokio-test_defaults_tokio_test", + name: "tokio-test_test_defaults", crate_name: "tokio_test", + cargo_env_compat: true, + cargo_pkg_version: "0.4.2", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -80,9 +54,10 @@ rust_defaults { ], } -rust_test_host { - name: "tokio-test_host_test_tests_block_on", - defaults: ["tokio-test_defaults_tokio_test"], +rust_test { + name: "tokio-test_test_tests_block_on", + defaults: ["tokio-test_test_defaults"], + host_supported: true, srcs: ["tests/block_on.rs"], test_options: { unit_test: true, @@ -90,14 +65,9 @@ rust_test_host { } rust_test { - name: "tokio-test_device_test_tests_block_on", - defaults: ["tokio-test_defaults_tokio_test"], - srcs: ["tests/block_on.rs"], -} - -rust_test_host { - name: "tokio-test_host_test_tests_io", - defaults: ["tokio-test_defaults_tokio_test"], + name: "tokio-test_test_tests_io", + defaults: ["tokio-test_test_defaults"], + host_supported: true, srcs: ["tests/io.rs"], test_options: { unit_test: true, @@ -105,58 +75,11 @@ rust_test_host { } rust_test { - name: "tokio-test_device_test_tests_io", - defaults: ["tokio-test_defaults_tokio_test"], - srcs: ["tests/io.rs"], -} - -rust_test_host { - name: "tokio-test_host_test_tests_macros", - defaults: ["tokio-test_defaults_tokio_test"], + name: "tokio-test_test_tests_macros", + defaults: ["tokio-test_test_defaults"], + host_supported: true, srcs: ["tests/macros.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "tokio-test_device_test_tests_macros", - defaults: ["tokio-test_defaults_tokio_test"], - srcs: ["tests/macros.rs"], -} - -// dependent_library ["feature_list"] -// async-stream-0.3.1 -// async-stream-impl-0.3.1 -// autocfg-1.0.1 -// bytes-1.0.1 "default,std" -// cfg-if-1.0.0 -// futures-core-0.3.15 "alloc,default,std" -// futures-macro-0.3.15 -// futures-task-0.3.15 "alloc,std" -// futures-util-0.3.15 "alloc,async-await,async-await-macro,default,futures-macro,proc-macro-hack,proc-macro-nested,slab,std" -// instant-0.1.9 -// libc-0.2.94 "default,std" -// lock_api-0.4.4 -// log-0.4.14 -// memchr-2.4.0 "default,std" -// mio-0.7.11 "default,net,os-ext,os-poll,os-util,tcp,udp,uds" -// num_cpus-1.13.0 -// once_cell-1.7.2 "alloc,default,race,std" -// parking_lot-0.11.1 "default" -// parking_lot_core-0.8.3 -// pin-project-lite-0.2.6 -// pin-utils-0.1.0 -// proc-macro-hack-0.5.19 -// proc-macro-nested-0.1.7 -// proc-macro2-1.0.26 "default,proc-macro" -// quote-1.0.9 "default,proc-macro" -// scopeguard-1.1.0 -// signal-hook-registry-1.3.0 -// slab-0.4.3 "default,std" -// smallvec-1.6.1 -// syn-1.0.72 "clone-impls,default,derive,extra-traits,full,parsing,printing,proc-macro,quote,visit-mut" -// tokio-1.6.0 "bytes,default,fs,full,io-std,io-util,libc,macros,memchr,mio,net,num_cpus,once_cell,parking_lot,process,rt,rt-multi-thread,signal,signal-hook-registry,sync,test-util,time,tokio-macros,winapi" -// tokio-macros-1.2.0 -// tokio-stream-0.1.6 "default,time" -// unicode-xid-0.2.2 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index a83b104..f2e3379 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,212 +1,30 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "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": "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" - }, + "imports": [ { - "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" - }, + "path": "external/rust/crates/tokio" + } + ], + "presubmit": [ { - "name": "tokio_device_test_tests_tcp_socket" + "name": "tokio-test_test_tests_block_on" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "tokio-test_test_tests_io" }, { - "name": "tokio_device_test_tests_time_rt" - }, + "name": "tokio-test_test_tests_macros" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_udp" + "name": "tokio-test_test_tests_block_on" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "tokio-test_test_tests_io" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "tokio-test_test_tests_macros" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +} \ No newline at end of file -- cgit v1.2.3