diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:36 +0000 |
| commit | f9850d8324a5b52ff1b275a0cd3e4f5fddca1739 (patch) | |
| tree | 09396df369820670807da97f9e9f4fa4513c5749 | |
| parent | de9375c002f82188cae05c9e673e9d8fab7b0ea8 (diff) | |
| parent | 6aad49475962672e16b1c42691b4433b8cbbc81c (diff) | |
| download | unicode-width-f9850d8324a5b52ff1b275a0cd3e4f5fddca1739.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: fc032e38dc am: 305e977c59 am: caeb93fe7e am: 6aad494759
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-width/+/1912797
Change-Id: I207dd9e0c9fc4e4cf88618d9dd92ef4963d53060
| -rw-r--r-- | Android.bp | 25 | ||||
| -rw-r--r-- | TEST_MAPPING | 25 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 37 insertions, 18 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -50,28 +50,19 @@ rust_library { features: ["default"], } -rust_defaults { - name: "unicode-width_test_defaults", - crate_name: "unicode_width", +rust_test { + name: "unicode-width_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "unicode_width", cargo_env_compat: true, cargo_pkg_version: "0.1.9", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", - features: ["default"], -} - -rust_test_host { - name: "unicode-width_host_test_src_lib", - defaults: ["unicode-width_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "unicode-width_device_test_src_lib", - defaults: ["unicode-width_test_defaults"], + edition: "2015", + features: ["default"], } diff --git a/TEST_MAPPING b/TEST_MAPPING index b539787..6d1be59 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,30 @@ { "presubmit": [ { - "name": "unicode-width_device_test_src_lib" + "name": "keystore2_test" + }, + { + "name": "keystore2_vintf_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "unicode-width_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "keystore2_vintf_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "unicode-width_test_src_lib" } ] } 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 |