diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:32 +0000 |
commit | 3c9932ff16476cd562bbb990af8dcaedf0f3be06 (patch) | |
tree | d361da931e8c52ac15db3459546733dea4d562b9 | |
parent | dd7107a6e2b1ba739f715b3ce0d6b6937ff43b79 (diff) | |
parent | b07611c07c69b9fc056cfbaf4bfebc0d653e13a7 (diff) | |
download | matches-3c9932ff16476cd562bbb990af8dcaedf0f3be06.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10 am: b07611c07c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/matches/+/1912500
Change-Id: I9b0a2c012a28ecf0e8260fc4730d40b477b68439
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 26 |
2 files changed, 32 insertions, 43 deletions
@@ -34,33 +34,24 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "matches_test_defaults", - crate_name: "matches", +rust_test { + name: "matches_test_lib", // has rustc warnings - srcs: ["lib.rs"], + host_supported: true, + crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", + srcs: ["lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "matches_host_test_lib", - defaults: ["matches_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "matches_device_test_lib", - defaults: ["matches_test_defaults"], + edition: "2015", } rust_defaults { - name: "matches_test_defaults_matches", + name: "matches_test_defaults", crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", @@ -72,10 +63,11 @@ rust_defaults { ], } -rust_test_host { - name: "matches_host_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], +rust_test { + name: "matches_test_tests_macro_use_one", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/macro_use_one.rs"], test_options: { unit_test: true, @@ -83,25 +75,12 @@ rust_test_host { } rust_test { - name: "matches_device_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/macro_use_one.rs"], -} - -rust_test_host { - name: "matches_host_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], + name: "matches_test_tests_use_star", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/use_star.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "matches_device_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/use_star.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 798b57b..577d626 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,29 +1,39 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + }, + { + "path": "external/rust/crates/url" + } + ], "presubmit": [ { "name": "doh_unit_test" }, { - "name": "matches_device_test_lib" + "name": "matches_test_lib" }, { - "name": "matches_device_test_tests_macro_use_one" + "name": "matches_test_tests_macro_use_one" }, { - "name": "quiche_device_test_src_lib" - }, + "name": "matches_test_tests_use_star" + } + ], + "presubmit-rust": [ { - "name": "unicode-bidi_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "url_device_test_src_lib" + "name": "matches_test_lib" }, { - "name": "url_device_test_tests_data" + "name": "matches_test_tests_macro_use_one" }, { - "name": "url_device_test_tests_unit" + "name": "matches_test_tests_use_star" } ] } |