Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 9073812..1823074 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,14 +60,18 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "once_cell_test_defaults",
+rust_test {
+ name: "once_cell_test_src_lib",
+ host_supported: true,
crate_name: "once_cell",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "1.8.0",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"alloc",
@@ -82,27 +86,18 @@
],
}
-rust_test_host {
- name: "once_cell_host_test_src_lib",
- defaults: ["once_cell_test_defaults"],
+rust_test {
+ name: "once_cell_test_tests_it",
+ host_supported: true,
+ crate_name: "it",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.8.0",
+ srcs: ["tests/it.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "once_cell_device_test_src_lib",
- defaults: ["once_cell_test_defaults"],
-}
-
-rust_defaults {
- name: "once_cell_test_defaults_it",
- crate_name: "it",
- srcs: ["tests/it.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "1.8.0",
- test_suites: ["general-tests"],
- auto_gen_config: true,
edition: "2018",
features: [
"alloc",
@@ -117,16 +112,3 @@
"libregex",
],
}
-
-rust_test_host {
- name: "once_cell_host_test_tests_it",
- defaults: ["once_cell_test_defaults_it"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "once_cell_device_test_tests_it",
- defaults: ["once_cell_test_defaults_it"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8f658a8..febfdce 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,7 +1,30 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/quiche"
+ },
+ {
+ "path": "external/rust/crates/ring"
+ },
+ {
+ "path": "external/rust/crates/thread_local"
+ },
+ {
+ "path": "external/rust/crates/webpki"
+ }
+ ],
"presubmit": [
{
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "apkdmverity.test"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
"name": "doh_unit_test"
},
{
@@ -20,77 +43,57 @@
"name": "libidsig.test"
},
{
- "name": "once_cell_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "once_cell_device_test_tests_it"
+ "name": "once_cell_test_src_lib"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "once_cell_test_tests_it"
},
{
- "name": "ring_device_test_src_lib",
- "options": [
- {
- "test-timeout": "100000"
- }
- ]
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
},
{
- "name": "ring_device_test_tests_aead_tests"
+ "name": "apkdmverity.test"
},
{
- "name": "ring_device_test_tests_agreement_tests"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "ring_device_test_tests_constant_time_tests"
+ "name": "doh_unit_test"
},
{
- "name": "ring_device_test_tests_digest_tests",
- "options": [
- {
- "test-timeout": "600000"
- }
- ]
+ "name": "keystore2_test"
},
{
- "name": "ring_device_test_tests_ecdsa_tests"
+ "name": "legacykeystore_test"
},
{
- "name": "ring_device_test_tests_ed25519_tests"
+ "name": "libapkverify.integration_test"
},
{
- "name": "ring_device_test_tests_hkdf_tests"
+ "name": "libapkverify.test"
},
{
- "name": "ring_device_test_tests_hmac_tests"
+ "name": "libidsig.test"
},
{
- "name": "ring_device_test_tests_pbkdf2_tests"
+ "name": "microdroid_manager_test"
},
{
- "name": "ring_device_test_tests_quic_tests"
+ "name": "once_cell_test_src_lib"
},
{
- "name": "ring_device_test_tests_rand_tests"
+ "name": "once_cell_test_tests_it"
},
{
- "name": "ring_device_test_tests_rsa_tests"
- },
- {
- "name": "ring_device_test_tests_signature_tests"
- },
- {
- "name": "thread_local_device_test_src_lib"
- },
- {
- "name": "webpki_device_test_src_lib"
- },
- {
- "name": "webpki_device_test_tests_dns_name_tests"
- },
- {
- "name": "webpki_device_test_tests_integration"
+ "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 646ac59..506d866 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,4 +10,4 @@
"min-sdk-version": "29",
"run": true,
"tests": true
-}
+}
\ No newline at end of file
