Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 65aaaa7452 am: 97e48eeb7e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/1912517
Change-Id: Ifecafe4b02630e508062e5d7bbd9fa4ded087075
diff --git a/Android.bp b/Android.bp
index 99ace63..6bc1c19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,15 +37,19 @@
],
}
-rust_defaults {
- name: "bitflags_test_defaults",
- crate_name: "bitflags",
+rust_test {
+ name: "bitflags_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "bitflags",
cargo_env_compat: true,
cargo_pkg_version: "1.3.2",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: ["default"],
rustlibs: [
@@ -59,28 +63,19 @@
],
}
-rust_test_host {
- name: "bitflags_host_test_src_lib",
- defaults: ["bitflags_test_defaults"],
+rust_test {
+ name: "bitflags_test_tests_basic",
+ // has rustc warnings
+ host_supported: true,
+ crate_name: "bitflags",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.3.2",
+ srcs: ["tests/basic.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "bitflags_device_test_src_lib",
- defaults: ["bitflags_test_defaults"],
-}
-
-rust_defaults {
- name: "bitflags_test_defaults_bitflags",
- crate_name: "bitflags",
- // has rustc warnings
- srcs: ["tests/basic.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.3.2",
- test_suites: ["general-tests"],
- auto_gen_config: true,
edition: "2018",
features: ["default"],
rustlibs: [
@@ -95,24 +90,10 @@
],
}
-rust_test_host {
- name: "bitflags_host_test_tests_basic",
- defaults: ["bitflags_test_defaults_bitflags"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "bitflags_device_test_tests_basic",
- defaults: ["bitflags_test_defaults_bitflags"],
-}
-
rust_library {
name: "libbitflags",
// has rustc warnings
host_supported: true,
- vendor_available: true,
crate_name: "bitflags",
cargo_env_compat: true,
cargo_pkg_version: "1.3.2",
@@ -124,4 +105,5 @@
"com.android.compos",
"com.android.virt",
],
+ vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7bf985f..bb5b919 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,25 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
@@ -11,16 +31,10 @@
"name": "authfs_device_test_src_lib"
},
{
- "name": "base64_device_test_tests_decode"
+ "name": "bitflags_test_src_lib"
},
{
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "bitflags_device_test_src_lib"
+ "name": "bitflags_test_tests_basic"
},
{
"name": "keystore2_crypto_test_rust"
@@ -32,217 +46,63 @@
"name": "keystore2_test"
},
{
+ "name": "keystore2_test_utils_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
"name": "legacykeystore_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "name": "libsqlite3_bindgen_test"
- },
- {
"name": "microdroid_manager_test"
},
{
- "name": "tokio_device_test_tests__require_full"
+ "name": "open_then_run_module"
},
{
- "name": "tokio_device_test_tests_buffered"
- },
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "tokio_device_test_tests_io_async_fd"
+ "name": "ZipFuseTest"
},
{
- "name": "tokio_device_test_tests_io_async_read"
+ "name": "apkdmverity.test"
},
{
- "name": "tokio_device_test_tests_io_chain"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "tokio_device_test_tests_io_copy"
+ "name": "bitflags_test_src_lib"
},
{
- "name": "tokio_device_test_tests_io_copy_bidirectional"
+ "name": "bitflags_test_tests_basic"
},
{
- "name": "tokio_device_test_tests_io_driver"
+ "name": "keystore2_crypto_test_rust"
},
{
- "name": "tokio_device_test_tests_io_driver_drop"
+ "name": "keystore2_selinux_concurrency_test"
},
{
- "name": "tokio_device_test_tests_io_lines"
+ "name": "keystore2_test"
},
{
- "name": "tokio_device_test_tests_io_mem_stream"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "tokio_device_test_tests_io_read"
+ "name": "keystore2_vintf_test"
},
{
- "name": "tokio_device_test_tests_io_read_buf"
+ "name": "legacykeystore_test"
},
{
- "name": "tokio_device_test_tests_io_read_exact"
+ "name": "microdroid_manager_test"
},
{
- "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": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "open_then_run_module"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 3a58854..73b0969 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,10 +8,10 @@
"trybuild"
],
"device": true,
- "vendor_available": true,
"run": true,
- "tests": true,
"test-blocklist": [
"tests/compile.rs"
- ]
-}
+ ],
+ "tests": true,
+ "vendor-available": true
+}
\ No newline at end of file
