Snap for 8006021 from e0388b2993384e3619e5185d7e7b6eebafa31a9b to tm-release
Change-Id: I4d70e5ca9f3e6c3dcc012ddc24fdd768acf577e3
diff --git a/Android.bp b/Android.bp
index 846786d..2b63f27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@
name: "libpin_utils",
host_supported: true,
crate_name: "pin_utils",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
srcs: ["src/lib.rs"],
edition: "2018",
apex_available: [
@@ -52,30 +54,10 @@
}
rust_defaults {
- name: "pin-utils_defaults",
+ name: "pin-utils_test_defaults",
crate_name: "pin_utils",
- srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
-}
-
-rust_test_host {
- name: "pin-utils_host_test_src_lib",
- defaults: ["pin-utils_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "pin-utils_device_test_src_lib",
- defaults: ["pin-utils_defaults"],
-}
-
-rust_defaults {
- name: "pin-utils_defaults_pin_utils",
- crate_name: "pin_utils",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -84,9 +66,10 @@
],
}
-rust_test_host {
- name: "pin-utils_host_test_tests_projection",
- defaults: ["pin-utils_defaults_pin_utils"],
+rust_test {
+ name: "pin-utils_test_tests_projection",
+ defaults: ["pin-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/projection.rs"],
test_options: {
unit_test: true,
@@ -94,22 +77,11 @@
}
rust_test {
- name: "pin-utils_device_test_tests_projection",
- defaults: ["pin-utils_defaults_pin_utils"],
- srcs: ["tests/projection.rs"],
-}
-
-rust_test_host {
- name: "pin-utils_host_test_tests_stack_pin",
- defaults: ["pin-utils_defaults_pin_utils"],
+ name: "pin-utils_test_tests_stack_pin",
+ defaults: ["pin-utils_test_defaults"],
+ host_supported: true,
srcs: ["tests/stack_pin.rs"],
test_options: {
unit_test: true,
},
}
-
-rust_test {
- name: "pin-utils_device_test_tests_stack_pin",
- defaults: ["pin-utils_defaults_pin_utils"],
- srcs: ["tests/stack_pin.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9b4e42d..e517942 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,269 +1,54 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/anyhow"
+ },
+ {
+ "path": "external/rust/crates/futures-util"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/tokio-test"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
},
{
- "name": "anyhow_device_test_src_lib"
- },
- {
- "name": "anyhow_device_test_tests_test_autotrait"
- },
- {
- "name": "anyhow_device_test_tests_test_boxed"
- },
- {
- "name": "anyhow_device_test_tests_test_chain"
- },
- {
- "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"
- },
- {
- "name": "anyhow_device_test_tests_test_source"
- },
- {
"name": "authfs_device_test_src_lib"
},
{
"name": "doh_unit_test"
},
{
- "name": "futures-util_device_test_src_lib"
+ "name": "pin-utils_test_tests_projection"
},
{
- "name": "pin-utils_device_test_src_lib"
+ "name": "pin-utils_test_tests_stack_pin"
},
{
- "name": "pin-utils_device_test_tests_projection"
- },
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "pin-utils_device_test_tests_stack_pin"
+ "name": "ZipFuseTest"
},
{
- "name": "tokio-test_device_test_src_lib"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "tokio-test_device_test_tests_block_on"
+ "name": "doh_unit_test"
},
{
- "name": "tokio-test_device_test_tests_io"
+ "name": "pin-utils_test_tests_projection"
},
{
- "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"
+ "name": "pin-utils_test_tests_stack_pin"
},
{
"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
