Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: Ib31659d10c4b7d817b0f821bab4a3a455a7082c5
diff --git a/Android.bp b/Android.bp
index 85963fd..ff9b357 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,8 @@
name: "libspin",
host_supported: true,
crate_name: "spin",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.2",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -50,12 +52,18 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "spin_test_defaults",
+rust_test {
+ name: "spin_test_src_lib",
+ host_supported: true,
crate_name: "spin",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.9.2",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
features: [
"once",
@@ -63,15 +71,8 @@
],
}
-rust_test_host {
- name: "spin_host_test_src_lib",
- defaults: ["spin_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "spin_device_test_src_lib",
- defaults: ["spin_test_defaults"],
-}
+// Errors when listing tests:
+// error[E0433]: failed to resolve: could not find `Mutex` in `spin`
+// error[E0433]: failed to resolve: could not find `RwLock` in `spin`
+// error: could not compile `spin` due to 2 previous errors
+// error: build failed
diff --git a/TEST_MAPPING b/TEST_MAPPING
index c9cd772..786defc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,16 @@
// 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/webpki"
+ }
+ ],
"presubmit": [
{
"name": "apkdmverity.test"
@@ -20,74 +31,36 @@
"name": "microdroid_manager_test"
},
{
- "name": "quiche_device_test_src_lib"
- },
- {
- "name": "ring_device_test_src_lib",
- "options": [
- {
- "test-timeout": "100000"
- }
- ]
- },
- {
- "name": "ring_device_test_tests_aead_tests"
- },
- {
- "name": "ring_device_test_tests_agreement_tests"
- },
- {
- "name": "ring_device_test_tests_constant_time_tests"
- },
- {
- "name": "ring_device_test_tests_digest_tests",
- "options": [
- {
- "test-timeout": "600000"
- }
- ]
- },
- {
- "name": "ring_device_test_tests_ecdsa_tests"
- },
- {
- "name": "ring_device_test_tests_ed25519_tests"
- },
- {
- "name": "ring_device_test_tests_hkdf_tests"
- },
- {
- "name": "ring_device_test_tests_hmac_tests"
- },
- {
- "name": "ring_device_test_tests_pbkdf2_tests"
- },
- {
- "name": "ring_device_test_tests_quic_tests"
- },
- {
- "name": "ring_device_test_tests_rand_tests"
- },
- {
- "name": "ring_device_test_tests_rsa_tests"
- },
- {
- "name": "ring_device_test_tests_signature_tests"
- },
- {
- "name": "spin_device_test_src_lib"
+ "name": "spin_test_src_lib"
},
{
"name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "apkdmverity.test"
},
{
- "name": "webpki_device_test_src_lib"
+ "name": "doh_unit_test"
},
{
- "name": "webpki_device_test_tests_dns_name_tests"
+ "name": "libapkverify.integration_test"
},
{
- "name": "webpki_device_test_tests_integration"
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "libidsig.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "spin_test_src_lib"
+ },
+ {
+ "name": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 49b7e6f..1fff1ac 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -11,4 +11,4 @@
"min-sdk-version": "29",
"run": true,
"tests": true
-}
+}
\ No newline at end of file
