From c051876648d65c7f5b07139ad4531404c75aec90 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:03:03 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: I490e719e4c9845d6036bd3372ce6ef88992b41d8 --- Android.bp | 12 +--- TEST_MAPPING | 207 +---------------------------------------------------- cargo2android.json | 4 ++ 3 files changed, 10 insertions(+), 213 deletions(-) create mode 100644 cargo2android.json diff --git a/Android.bp b/Android.bp index 24f721e..18934f1 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device. +// 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: "libasync_stream", host_supported: true, crate_name: "async_stream", + cargo_env_compat: true, + cargo_pkg_version: "0.3.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -29,11 +31,3 @@ rust_library { ], proc_macros: ["libasync_stream_impl"], } - -// dependent_library ["feature_list"] -// async-stream-impl-0.3.2 -// futures-core-0.3.15 "alloc,default,std" -// proc-macro2-1.0.27 "default,proc-macro" -// quote-1.0.9 "default,proc-macro" -// syn-1.0.73 "clone-impls,default,derive,extra-traits,full,parsing,printing,proc-macro,quote,visit-mut" -// unicode-xid-0.2.2 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index a83b104..dfc3524 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,212 +1,11 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "tokio-test_device_test_src_lib" + "path": "external/rust/crates/tokio" }, { - "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" - }, - { - "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" - }, - { - "name": "tokio_device_test_tests_time_rt" - }, - { - "name": "tokio_device_test_tests_udp" - }, - { - "name": "tokio_device_test_tests_uds_cred" - }, - { - "name": "tokio_device_test_tests_uds_split" + "path": "external/rust/crates/tokio-test" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +} \ No newline at end of file -- cgit v1.2.3