diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:21 +0000 |
| commit | 69529943814d7aeb7a26a3588431eb8223eb75d2 (patch) | |
| tree | 0ee559588586481d8143b065faecf42d26133e40 | |
| parent | 5939050353727549b7085621f3e2ec153a4452f2 (diff) | |
| parent | 1e06739e0b1167c12c3de6fcdf134cfc9d5c5753 (diff) | |
| download | unicode-normalization-69529943814d7aeb7a26a3588431eb8223eb75d2.tar.gz | |
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: 1e06739e0b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-normalization/+/1912098
Change-Id: Ic16d026e2cc9cfee20c41e6608a698f141225c7a
| -rw-r--r-- | Android.bp | 29 | ||||
| -rw-r--r-- | TEST_MAPPING | 22 |
2 files changed, 23 insertions, 28 deletions
@@ -44,6 +44,8 @@ rust_library { name: "libunicode_normalization", host_supported: true, crate_name: "unicode_normalization", + cargo_env_compat: true, + cargo_pkg_version: "0.1.19", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -60,12 +62,18 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "unicode-normalization_defaults", +rust_test { + name: "unicode-normalization_test_src_lib", + host_supported: true, crate_name: "unicode_normalization", + cargo_env_compat: true, + cargo_pkg_version: "0.1.19", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -75,20 +83,3 @@ rust_defaults { "libtinyvec", ], } - -rust_test_host { - name: "unicode-normalization_host_test_src_lib", - defaults: ["unicode-normalization_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "unicode-normalization_device_test_src_lib", - defaults: ["unicode-normalization_defaults"], -} - -// dependent_library ["feature_list"] -// tinyvec-1.2.0 "alloc,default,tinyvec_macros" -// tinyvec_macros-0.1.0 diff --git a/TEST_MAPPING b/TEST_MAPPING index bf91080..d90d8b3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,23 +1,27 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "doh_unit_test" + "path": "external/rust/crates/quiche" }, { - "name": "quiche_device_test_src_lib" - }, + "path": "external/rust/crates/url" + } + ], + "presubmit": [ { - "name": "unicode-normalization_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "url_device_test_src_lib" - }, + "name": "unicode-normalization_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "url_device_test_tests_data" + "name": "doh_unit_test" }, { - "name": "url_device_test_tests_unit" + "name": "unicode-normalization_test_src_lib" } ] } |