diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 9bfcc5283c7a8632acb7964a92e3fdd40b836e7f (patch) | |
tree | 56068c575860f70746f5bfc129e9ffed98f34ed4 | |
parent | cfcc28f6fe56aaae11bcc393124b6e6e40d76e7e (diff) | |
parent | d30a97533b9565ebba5b570037798ff3d350325f (diff) | |
download | proc-macro-nested-9bfcc5283c7a8632acb7964a92e3fdd40b836e7f.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | TEST_MAPPING | 253 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 19 insertions, 263 deletions
@@ -50,6 +50,8 @@ rust_library { name: "libproc_macro_nested", host_supported: true, crate_name: "proc_macro_nested", + cargo_env_compat: true, + cargo_pkg_version: "0.1.7", srcs: [ "src/lib.rs", ":copy_proc-macro-nested_build_out", @@ -62,28 +64,3 @@ rust_library { ], min_sdk_version: "29", } - -rust_defaults { - name: "proc-macro-nested_defaults", - crate_name: "proc_macro_nested", - srcs: [ - "src/lib.rs", - ":copy_proc-macro-nested_build_out", - ], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "proc-macro-nested_host_test_src_lib", - defaults: ["proc-macro-nested_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "proc-macro-nested_device_test_src_lib", - defaults: ["proc-macro-nested_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index ee7e8c2..5ef61de 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,44 +1,22 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "anyhow_device_test_src_lib" - }, + "imports": [ { - "name": "anyhow_device_test_tests_test_autotrait" + "path": "external/rust/crates/anyhow" }, { - "name": "anyhow_device_test_tests_test_boxed" + "path": "external/rust/crates/futures-util" }, { - "name": "anyhow_device_test_tests_test_chain" + "path": "external/rust/crates/tokio" }, { - "name": "anyhow_device_test_tests_test_context" - }, - { - "name": "anyhow_device_test_tests_test_convert" - }, - { - "name": "anyhow_device_test_tests_test_downcast" - }, - { - "name": "anyhow_device_test_tests_test_ffi" - }, - { - "name": "anyhow_device_test_tests_test_fmt" - }, - { - "name": "anyhow_device_test_tests_test_macros" - }, - { - "name": "anyhow_device_test_tests_test_repr" - }, + "path": "external/rust/crates/tokio-test" + } + ], + "presubmit": [ { - "name": "anyhow_device_test_tests_test_source" + "name": "ZipFuseTest" }, { "name": "authfs_device_test_src_lib" @@ -47,217 +25,18 @@ "name": "doh_unit_test" }, { - "name": "futures-util_device_test_src_lib" - }, - { - "name": "proc-macro-nested_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": "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": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_udp" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "doh_unit_test" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 43dbcda..ed797a8 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,10 +4,10 @@ "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "copy-out": true, "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true, "tests": true }
\ No newline at end of file |