diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:38 +0000 |
commit | 22d2ac9b83c99a170bf55a6c6fba242af0817aa3 (patch) | |
tree | f1525b6ccaaf8350084ace726abc9a6e4048a674 | |
parent | c9875fdaad259bf3efe065c768eeeb28c5d6c537 (diff) | |
parent | f871b67770c8c42ea4c5e17fdd44d109a4da3a53 (diff) | |
download | slab-22d2ac9b83c99a170bf55a6c6fba242af0817aa3.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5f6aacb217 am: 5cb4ddfeae am: f871b67770
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1912696
Change-Id: Ia283ae5b7d836465bc1e2c086b5fd15f1a89db1d
-rw-r--r-- | Android.bp | 76 | ||||
-rw-r--r-- | TEST_MAPPING | 257 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 27 insertions, 308 deletions
@@ -22,6 +22,8 @@ rust_library { name: "libslab", host_supported: true, crate_name: "slab", + cargo_env_compat: true, + cargo_pkg_version: "0.4.4", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -36,41 +38,18 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "slab_test_defaults", +rust_test { + name: "slab_test_tests_slab", + host_supported: true, crate_name: "slab", - srcs: ["src/lib.rs"], + cargo_env_compat: true, + cargo_pkg_version: "0.4.4", + srcs: ["tests/slab.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", - features: [ - "default", - "std", - ], - rustlibs: [ - "libserde", - "libserde_test", - ], -} - -rust_test_host { - name: "slab_host_test_src_lib", - defaults: ["slab_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "slab_device_test_src_lib", - defaults: ["slab_test_defaults"], -} - -rust_defaults { - name: "slab_test_defaults_slab", - crate_name: "slab", - test_suites: ["general-tests"], - auto_gen_config: true, edition: "2018", features: [ "default", @@ -82,42 +61,3 @@ rust_defaults { "libslab", ], } - -rust_test_host { - name: "slab_host_test_tests_serde", - defaults: ["slab_test_defaults_slab"], - srcs: ["tests/serde.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "slab_device_test_tests_serde", - defaults: ["slab_test_defaults_slab"], - srcs: ["tests/serde.rs"], -} - -rust_test_host { - name: "slab_host_test_tests_slab", - defaults: ["slab_test_defaults_slab"], - srcs: ["tests/slab.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "slab_device_test_tests_slab", - defaults: ["slab_test_defaults_slab"], - srcs: ["tests/slab.rs"], -} - -// dependent_library ["feature_list"] -// proc-macro2-1.0.28 "default,proc-macro" -// quote-1.0.9 "default,proc-macro" -// serde-1.0.127 "default,derive,serde_derive,std" -// serde_derive-1.0.127 "default" -// serde_test-1.0.127 -// syn-1.0.74 "clone-impls,default,derive,parsing,printing,proc-macro,quote" -// unicode-xid-0.2.2 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index a47d220..9af5cdc 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,223 +25,24 @@ "name": "doh_unit_test" }, { - "name": "futures-util_device_test_src_lib" - }, - { - "name": "slab_device_test_src_lib" - }, - { - "name": "slab_device_test_tests_serde" - }, - { - "name": "slab_device_test_tests_slab" - }, - { - "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": "slab_test_tests_slab" }, { - "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": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_time_rt" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_udp" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "slab_test_tests_slab" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 44e747c..5412b5b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,9 +4,9 @@ "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true, "tests": true }
\ No newline at end of file |