Snap for 8006021 from b0773d52ce9ade63895aee7e70fe9050d2d8e6b5 to tm-release
Change-Id: I6931e767cc4864287eefe709c0dac8c9683c01ca
diff --git a/Android.bp b/Android.bp
index 122a9d8..1012ded 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --device --run --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: [
"external_rust_crates_minimal-lexical_license",
@@ -59,34 +57,6 @@
rust_defaults {
name: "minimal-lexical_test_defaults",
crate_name: "minimal_lexical",
- srcs: ["src/lib.rs"],
- cargo_env_compat: true,
- cargo_pkg_version: "0.2.0",
- test_suites: ["general-tests"],
- auto_gen_config: true,
- edition: "2018",
- features: [
- "default",
- "std",
- ],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_src_lib",
- defaults: ["minimal-lexical_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "minimal-lexical_device_test_src_lib",
- defaults: ["minimal-lexical_test_defaults"],
-}
-
-rust_defaults {
- name: "minimal-lexical_test_defaults_minimal_lexical",
- crate_name: "minimal_lexical",
cargo_env_compat: true,
cargo_pkg_version: "0.2.0",
test_suites: ["general-tests"],
@@ -101,39 +71,10 @@
],
}
-rust_test_host {
- name: "minimal-lexical_host_test_tests_bellerophon",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/bellerophon.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
rust_test {
- name: "minimal-lexical_device_test_tests_bellerophon",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/bellerophon.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_bellerophon_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/bellerophon_tests.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "minimal-lexical_device_test_tests_bellerophon_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/bellerophon_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_integration_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_integration_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/integration_tests.rs"],
test_options: {
unit_test: true,
@@ -141,14 +82,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_integration_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/integration_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_lemire_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_lemire_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/lemire_tests.rs"],
test_options: {
unit_test: true,
@@ -156,29 +92,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_lemire_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/lemire_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_libm_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/libm_tests.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "minimal-lexical_device_test_tests_libm_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/libm_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_mask_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_mask_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/mask_tests.rs"],
test_options: {
unit_test: true,
@@ -186,14 +102,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_mask_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/mask_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_number_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_number_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/number_tests.rs"],
test_options: {
unit_test: true,
@@ -201,14 +112,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_number_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/number_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_parse_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_parse_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/parse_tests.rs"],
test_options: {
unit_test: true,
@@ -216,14 +122,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_parse_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/parse_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_rounding_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_rounding_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/rounding_tests.rs"],
test_options: {
unit_test: true,
@@ -231,14 +132,9 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_rounding_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/rounding_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_slow_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_slow_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/slow_tests.rs"],
test_options: {
unit_test: true,
@@ -246,37 +142,11 @@
}
rust_test {
- name: "minimal-lexical_device_test_tests_slow_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/slow_tests.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_stackvec",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/stackvec.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "minimal-lexical_device_test_tests_stackvec",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/stackvec.rs"],
-}
-
-rust_test_host {
- name: "minimal-lexical_host_test_tests_vec_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
+ name: "minimal-lexical_test_tests_vec_tests",
+ defaults: ["minimal-lexical_test_defaults"],
+ host_supported: true,
srcs: ["tests/vec_tests.rs"],
test_options: {
unit_test: true,
},
}
-
-rust_test {
- name: "minimal-lexical_device_test_tests_vec_tests",
- defaults: ["minimal-lexical_test_defaults_minimal_lexical"],
- srcs: ["tests/vec_tests.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6de82c2..8b8f493 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,44 +1,96 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/oid-registry"
+ },
+ {
+ "path": "external/rust/crates/rusticata-macros"
+ }
+ ],
"presubmit": [
{
- "name": "minimal-lexical_device_test_src_lib"
+ "name": "keystore2_test"
},
{
- "name": "minimal-lexical_device_test_tests_bellerophon"
+ "name": "legacykeystore_test"
},
{
- "name": "minimal-lexical_device_test_tests_bellerophon_tests"
+ "name": "libapkverify.integration_test"
},
{
- "name": "minimal-lexical_device_test_tests_integration_tests"
+ "name": "libapkverify.test"
},
{
- "name": "minimal-lexical_device_test_tests_lemire_tests"
+ "name": "microdroid_manager_test"
},
{
- "name": "minimal-lexical_device_test_tests_libm_tests"
+ "name": "minimal-lexical_test_tests_integration_tests"
},
{
- "name": "minimal-lexical_device_test_tests_mask_tests"
+ "name": "minimal-lexical_test_tests_lemire_tests"
},
{
- "name": "minimal-lexical_device_test_tests_number_tests"
+ "name": "minimal-lexical_test_tests_mask_tests"
},
{
- "name": "minimal-lexical_device_test_tests_parse_tests"
+ "name": "minimal-lexical_test_tests_number_tests"
},
{
- "name": "minimal-lexical_device_test_tests_rounding_tests"
+ "name": "minimal-lexical_test_tests_parse_tests"
},
{
- "name": "minimal-lexical_device_test_tests_slow_tests"
+ "name": "minimal-lexical_test_tests_rounding_tests"
},
{
- "name": "minimal-lexical_device_test_tests_stackvec"
+ "name": "minimal-lexical_test_tests_slow_tests"
},
{
- "name": "minimal-lexical_device_test_tests_vec_tests"
+ "name": "minimal-lexical_test_tests_vec_tests"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "microdroid_manager_test"
+ },
+ {
+ "name": "minimal-lexical_test_tests_integration_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_lemire_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_mask_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_number_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_parse_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_rounding_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_slow_tests"
+ },
+ {
+ "name": "minimal-lexical_test_tests_vec_tests"
}
]
}
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
