Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index b1239b0..c6f4848 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,17 +42,25 @@
name: "libunicode_xid",
host_supported: true,
crate_name: "unicode_xid",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.2",
srcs: ["src/lib.rs"],
edition: "2015",
features: ["default"],
}
-rust_defaults {
- name: "unicode-xid_defaults",
+rust_test {
+ name: "unicode-xid_test_src_lib",
+ host_supported: true,
crate_name: "unicode_xid",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.2",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
features: ["default"],
rustlibs: [
@@ -60,25 +68,18 @@
],
}
-rust_test_host {
- name: "unicode-xid_host_test_src_lib",
- defaults: ["unicode-xid_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "unicode-xid_device_test_src_lib",
- defaults: ["unicode-xid_defaults"],
-}
-
-rust_defaults {
- name: "unicode-xid_defaults_exhaustive_tests",
+ name: "unicode-xid_test_tests_exhaustive_tests",
+ host_supported: true,
crate_name: "exhaustive_tests",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.2",
srcs: ["tests/exhaustive_tests.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
features: ["default"],
rustlibs: [
@@ -86,74 +87,3 @@
"libunicode_xid",
],
}
-
-rust_test_host {
- name: "unicode-xid_host_test_tests_exhaustive_tests",
- defaults: ["unicode-xid_defaults_exhaustive_tests"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "unicode-xid_device_test_tests_exhaustive_tests",
- defaults: ["unicode-xid_defaults_exhaustive_tests"],
-}
-
-// dependent_library ["feature_list"]
-// atty-0.2.14
-// autocfg-1.0.1
-// bitflags-1.2.1 "default"
-// bstr-0.2.16 "default,lazy_static,regex-automata,serde,serde1,serde1-nostd,std,unicode"
-// byteorder-1.4.3
-// cast-0.2.6 "default,std"
-// cfg-if-1.0.0
-// clap-2.33.3
-// criterion-0.3.4 "cargo_bench_support,default"
-// criterion-plot-0.4.3
-// crossbeam-channel-0.5.1 "crossbeam-utils,default,std"
-// crossbeam-deque-0.8.0 "crossbeam-epoch,crossbeam-utils,default,std"
-// crossbeam-epoch-0.9.4 "alloc,lazy_static,std"
-// crossbeam-utils-0.8.4 "default,lazy_static,std"
-// csv-1.1.6
-// csv-core-0.1.10 "default"
-// either-1.6.1
-// half-1.7.1
-// itertools-0.10.0 "default,use_alloc,use_std"
-// itertools-0.9.0 "default,use_std"
-// itoa-0.4.7 "default,std"
-// lazy_static-1.4.0
-// libc-0.2.94 "default,std"
-// memchr-2.4.0 "std"
-// memoffset-0.6.3 "default"
-// num-traits-0.2.14 "default,std"
-// num_cpus-1.13.0
-// oorandom-11.1.3
-// pest-2.1.3
-// plotters-0.3.0 "area_series,line_series,plotters-svg,svg_backend"
-// plotters-backend-0.3.0
-// plotters-svg-0.3.0
-// proc-macro2-1.0.26 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// rayon-1.5.1
-// rayon-core-1.9.1
-// regex-1.5.4 "std"
-// regex-automata-0.1.9
-// regex-syntax-0.6.25
-// rustc_version-0.3.3
-// ryu-1.0.5
-// same-file-1.0.6
-// scopeguard-1.1.0
-// semver-0.11.0 "default"
-// semver-parser-0.10.2
-// serde-1.0.126 "default,std"
-// serde_cbor-0.11.1 "default,std"
-// serde_derive-1.0.126 "default"
-// serde_json-1.0.64 "default,std"
-// syn-1.0.72 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit"
-// textwrap-0.11.0
-// tinytemplate-1.2.1
-// ucd-trie-0.1.3 "default,std"
-// unicode-width-0.1.8 "default"
-// unicode-xid-0.2.2 "default"
-// walkdir-2.3.2
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 28c611a..357a717 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,118 +1,87 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/anyhow"
+ },
+ {
+ "path": "external/rust/crates/arbitrary"
+ },
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/bitflags"
+ },
+ {
+ "path": "external/rust/crates/bytes"
+ },
+ {
+ "path": "external/rust/crates/either"
+ },
+ {
+ "path": "external/rust/crates/futures-util"
+ },
+ {
+ "path": "external/rust/crates/jni"
+ },
+ {
+ "path": "external/rust/crates/libm"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/oid-registry"
+ },
+ {
+ "path": "external/rust/crates/rand_chacha"
+ },
+ {
+ "path": "external/rust/crates/serde"
+ },
+ {
+ "path": "external/rust/crates/serde-xml-rs"
+ },
+ {
+ "path": "external/rust/crates/serde_cbor"
+ },
+ {
+ "path": "external/rust/crates/slab"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/tokio-test"
+ },
+ {
+ "path": "external/rust/crates/unicode-bidi"
+ },
+ {
+ "path": "external/rust/crates/url"
+ }
+ ],
"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": "apkdmverity.test"
},
{
"name": "authfs_device_test_src_lib"
},
{
- "name": "base64_device_test_tests_decode"
- },
- {
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
"name": "doh_unit_test"
},
{
- "name": "either_device_test_src_lib"
- },
- {
- "name": "futures-util_device_test_src_lib"
- },
- {
- "name": "jni_device_test_src_lib"
- },
- {
- "name": "jni_device_test_tests_executor"
- },
- {
- "name": "jni_device_test_tests_executor_nested_attach"
- },
- {
- "name": "jni_device_test_tests_java_integers"
- },
- {
- "name": "jni_device_test_tests_jmap"
- },
- {
- "name": "jni_device_test_tests_jni_api"
- },
- {
- "name": "jni_device_test_tests_jni_global_refs"
- },
- {
- "name": "jni_device_test_tests_threads_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_detach"
- },
- {
- "name": "jni_device_test_tests_threads_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_permanent"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_permanently"
- },
- {
"name": "keystore2_crypto_test_rust"
},
{
@@ -143,286 +112,81 @@
"name": "libidsig.test"
},
{
- "name": "libm_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "open_then_run_module"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "rustBinderTest"
+ },
+ {
+ "name": "unicode-xid_test_src_lib"
+ },
+ {
+ "name": "unicode-xid_test_tests_exhaustive_tests"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "doh_unit_test"
+ },
+ {
+ "name": "keystore2_crypto_test_rust"
+ },
+ {
+ "name": "keystore2_selinux_concurrency_test"
+ },
+ {
+ "name": "keystore2_selinux_test"
+ },
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "keystore2_test_utils_test"
+ },
+ {
+ "name": "keystore2_vintf_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "libidsig.test"
},
{
"name": "microdroid_manager_test"
},
{
- "name": "oid-registry_device_test_src_lib"
+ "name": "open_then_run_module"
},
{
- "name": "serde-xml-rs_device_test_src_lib"
+ "name": "rustBinderTest"
},
{
- "name": "serde_cbor_device_test_src_lib"
+ "name": "unicode-xid_test_src_lib"
},
{
- "name": "serde_cbor_device_test_tests_bennofs"
- },
- {
- "name": "serde_cbor_device_test_tests_canonical"
- },
- {
- "name": "serde_cbor_device_test_tests_de"
- },
- {
- "name": "serde_cbor_device_test_tests_enum"
- },
- {
- "name": "serde_cbor_device_test_tests_ser"
- },
- {
- "name": "serde_cbor_device_test_tests_std_types"
- },
- {
- "name": "serde_cbor_device_test_tests_tags"
- },
- {
- "name": "serde_cbor_device_test_tests_value"
- },
- {
- "name": "serde_test_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": "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-bidi_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
- },
- {
- "name": "url_device_test_src_lib"
- },
- {
- "name": "url_device_test_tests_data"
- },
- {
- "name": "url_device_test_tests_unit"
+ "name": "unicode-xid_test_tests_exhaustive_tests"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
