Snap for 8005954 from c020b9e655285821e5a77fd37c48e3237dfdbe96 to sdk-release
Change-Id: If50c04b3bb32be7e964df114b4f17b8d5a02d1f7
diff --git a/Android.bp b/Android.bp
index 1d29c81..d49dd1e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,17 +76,21 @@
],
}
-rust_defaults {
- name: "num-bigint_test_defaults",
+rust_test {
+ name: "num-bigint_test_src_lib",
+ host_supported: true,
crate_name: "num_bigint",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.4.2",
srcs: [
"src/lib.rs",
":copy_num-bigint_build_out",
],
- cargo_env_compat: true,
- cargo_pkg_version: "0.4.2",
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -102,21 +106,8 @@
],
}
-rust_test_host {
- name: "num-bigint_host_test_src_lib",
- defaults: ["num-bigint_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "num-bigint_device_test_src_lib",
- defaults: ["num-bigint_test_defaults"],
-}
-
rust_defaults {
- name: "num-bigint_test_defaults_num_bigint",
+ name: "num-bigint_test_defaults",
crate_name: "num_bigint",
cargo_env_compat: true,
cargo_pkg_version: "0.4.2",
@@ -138,9 +129,10 @@
],
}
-rust_test_host {
- name: "num-bigint_host_test_tests_bigint",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+rust_test {
+ name: "num-bigint_test_tests_bigint",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/bigint.rs",
":copy_num-bigint_build_out",
@@ -151,17 +143,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_bigint",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/bigint.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_bigint_bitwise",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_bigint_bitwise",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/bigint_bitwise.rs",
":copy_num-bigint_build_out",
@@ -172,17 +156,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_bigint_bitwise",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/bigint_bitwise.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_bigint_scalar",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_bigint_scalar",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/bigint_scalar.rs",
":copy_num-bigint_build_out",
@@ -193,17 +169,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_bigint_scalar",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/bigint_scalar.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_biguint",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_biguint",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/biguint.rs",
":copy_num-bigint_build_out",
@@ -214,17 +182,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_biguint",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/biguint.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_biguint_scalar",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_biguint_scalar",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/biguint_scalar.rs",
":copy_num-bigint_build_out",
@@ -235,17 +195,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_biguint_scalar",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/biguint_scalar.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_modpow",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_modpow",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/modpow.rs",
":copy_num-bigint_build_out",
@@ -256,17 +208,9 @@
}
rust_test {
- name: "num-bigint_device_test_tests_modpow",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/modpow.rs",
- ":copy_num-bigint_build_out",
- ],
-}
-
-rust_test_host {
- name: "num-bigint_host_test_tests_roots",
- defaults: ["num-bigint_test_defaults_num_bigint"],
+ name: "num-bigint_test_tests_roots",
+ defaults: ["num-bigint_test_defaults"],
+ host_supported: true,
srcs: [
"tests/roots.rs",
":copy_num-bigint_build_out",
@@ -275,12 +219,3 @@
unit_test: true,
},
}
-
-rust_test {
- name: "num-bigint_device_test_tests_roots",
- defaults: ["num-bigint_test_defaults_num_bigint"],
- srcs: [
- "tests/roots.rs",
- ":copy_num-bigint_build_out",
- ],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3e9e35c..a82f7e0 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/oid-registry"
+ }
+ ],
"presubmit": [
{
"name": "libapkverify.integration_test"
@@ -11,31 +16,63 @@
"name": "microdroid_manager_test"
},
{
- "name": "num-bigint_device_test_src_lib"
+ "name": "num-bigint_test_src_lib"
},
{
- "name": "num-bigint_device_test_tests_bigint"
+ "name": "num-bigint_test_tests_bigint"
},
{
- "name": "num-bigint_device_test_tests_bigint_bitwise"
+ "name": "num-bigint_test_tests_bigint_bitwise"
},
{
- "name": "num-bigint_device_test_tests_bigint_scalar"
+ "name": "num-bigint_test_tests_bigint_scalar"
},
{
- "name": "num-bigint_device_test_tests_biguint"
+ "name": "num-bigint_test_tests_biguint"
},
{
- "name": "num-bigint_device_test_tests_biguint_scalar"
+ "name": "num-bigint_test_tests_biguint_scalar"
},
{
- "name": "num-bigint_device_test_tests_modpow"
+ "name": "num-bigint_test_tests_modpow"
},
{
- "name": "num-bigint_device_test_tests_roots"
+ "name": "num-bigint_test_tests_roots"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "libapkverify.integration_test"
},
{
- "name": "oid-registry_device_test_src_lib"
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "num-bigint_test_src_lib"
+ },
+ {
+ "name": "num-bigint_test_tests_bigint"
+ },
+ {
+ "name": "num-bigint_test_tests_bigint_bitwise"
+ },
+ {
+ "name": "num-bigint_test_tests_bigint_scalar"
+ },
+ {
+ "name": "num-bigint_test_tests_biguint"
+ },
+ {
+ "name": "num-bigint_test_tests_biguint_scalar"
+ },
+ {
+ "name": "num-bigint_test_tests_modpow"
+ },
+ {
+ "name": "num-bigint_test_tests_roots"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index d59f27e..76ddc04 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,9 @@
{
- "cfg-blocklist": ["use_addcarry"],
+ "cfg-blocklist": [
+ "use_addcarry"
+ ],
"copy-out": true,
"device": true,
"run": true,
"tests": true
-}
+}
\ No newline at end of file
