diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 3f61f20aa30bab713cd65a3bc5d0c2e03428d4e7 (patch) | |
tree | 638ab4865250accaa0829e4469b459f550fed409 | |
parent | 00f6b0284ee194abf53d422ab43fb0e18c103e28 (diff) | |
parent | 1a12ef6db4d64cf4d447c2dcecd6b89d99b698b9 (diff) | |
download | num-integer-3f61f20aa30bab713cd65a3bc5d0c2e03428d4e7.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 51 | ||||
-rw-r--r-- | TEST_MAPPING | 38 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 42 insertions, 52 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -55,14 +55,18 @@ rust_library { ], } -rust_defaults { - name: "num-integer_test_defaults", +rust_test { + name: "num-integer_test_src_lib", + host_supported: true, crate_name: "num_integer", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.1.44", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -74,21 +78,8 @@ rust_defaults { ], } -rust_test_host { - name: "num-integer_host_test_src_lib", - defaults: ["num-integer_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "num-integer_device_test_src_lib", - defaults: ["num-integer_test_defaults"], -} - rust_defaults { - name: "num-integer_test_defaults_num_integer", + name: "num-integer_test_defaults", crate_name: "num_integer", cargo_env_compat: true, cargo_pkg_version: "0.1.44", @@ -106,9 +97,10 @@ rust_defaults { ], } -rust_test_host { - name: "num-integer_host_test_tests_average", - defaults: ["num-integer_test_defaults_num_integer"], +rust_test { + name: "num-integer_test_tests_average", + defaults: ["num-integer_test_defaults"], + host_supported: true, srcs: ["tests/average.rs"], test_options: { unit_test: true, @@ -116,22 +108,11 @@ rust_test_host { } rust_test { - name: "num-integer_device_test_tests_average", - defaults: ["num-integer_test_defaults_num_integer"], - srcs: ["tests/average.rs"], -} - -rust_test_host { - name: "num-integer_host_test_tests_roots", - defaults: ["num-integer_test_defaults_num_integer"], + name: "num-integer_test_tests_roots", + defaults: ["num-integer_test_defaults"], + host_supported: true, srcs: ["tests/roots.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "num-integer_device_test_tests_roots", - defaults: ["num-integer_test_defaults_num_integer"], - srcs: ["tests/roots.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 687dbc8..1a7be13 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,47 +1,51 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "libapkverify.integration_test" + "path": "external/rust/crates/num-bigint" }, { - "name": "libapkverify.test" - }, + "path": "external/rust/crates/oid-registry" + } + ], + "presubmit": [ { - "name": "num-bigint_device_test_src_lib" + "name": "libapkverify.integration_test" }, { - "name": "num-bigint_device_test_tests_bigint" + "name": "libapkverify.test" }, { - "name": "num-bigint_device_test_tests_bigint_bitwise" + "name": "microdroid_manager_test" }, { - "name": "num-bigint_device_test_tests_bigint_scalar" + "name": "num-integer_test_src_lib" }, { - "name": "num-bigint_device_test_tests_biguint" + "name": "num-integer_test_tests_average" }, { - "name": "num-bigint_device_test_tests_biguint_scalar" - }, + "name": "num-integer_test_tests_roots" + } + ], + "presubmit-rust": [ { - "name": "num-bigint_device_test_tests_modpow" + "name": "libapkverify.integration_test" }, { - "name": "num-bigint_device_test_tests_roots" + "name": "libapkverify.test" }, { - "name": "num-integer_device_test_src_lib" + "name": "microdroid_manager_test" }, { - "name": "num-integer_device_test_tests_average" + "name": "num-integer_test_src_lib" }, { - "name": "num-integer_device_test_tests_roots" + "name": "num-integer_test_tests_average" }, { - "name": "oid-registry_device_test_src_lib" + "name": "num-integer_test_tests_roots" } ] } 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 |