diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:20 +0000 |
commit | 1b398da6c0607dd042e6ec24a309e240eb4fd459 (patch) | |
tree | 26b8e8b611d7ea6aeee076a2c148283e8815c2b0 | |
parent | 44be0ab882f25e73e4ee2dd929ed650016431526 (diff) | |
parent | b483d0cb23801bdf1422fbbc8f25e6e7c1ebacc0 (diff) | |
download | minimal-lexical-1b398da6c0607dd042e6ec24a309e240eb4fd459.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: b483d0cb23
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/minimal-lexical/+/1912714
Change-Id: I46b98b6ddc472411cd64c86ab8b517e14fa0d776
-rw-r--r-- | Android.bp | 180 | ||||
-rw-r--r-- | TEST_MAPPING | 78 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 95 insertions, 168 deletions
@@ -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_library { 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,84 +71,30 @@ rust_defaults { ], } -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"], - srcs: ["tests/integration_tests.rs"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "minimal-lexical_device_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"], -} - -rust_test_host { - name: "minimal-lexical_host_test_tests_lemire_tests", - defaults: ["minimal-lexical_test_defaults_minimal_lexical"], - srcs: ["tests/lemire_tests.rs"], test_options: { unit_test: true, }, } rust_test { - name: "minimal-lexical_device_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"], -} - -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_host { } 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,82 +112,41 @@ rust_test_host { } 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"], - srcs: ["tests/parse_tests.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "minimal-lexical_device_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"], -} - -rust_test_host { - name: "minimal-lexical_host_test_tests_rounding_tests", - defaults: ["minimal-lexical_test_defaults_minimal_lexical"], - srcs: ["tests/rounding_tests.rs"], test_options: { unit_test: true, }, } rust_test { - name: "minimal-lexical_device_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"], -} - -rust_test_host { - name: "minimal-lexical_host_test_tests_slow_tests", - defaults: ["minimal-lexical_test_defaults_minimal_lexical"], - srcs: ["tests/slow_tests.rs"], test_options: { unit_test: true, }, } rust_test { - name: "minimal-lexical_device_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"], -} - -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": "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" + } + ], + "presubmit-rust": [ + { + "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" } ] } 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 |