diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:41 +0000 |
commit | e0f613332231d7b60a758820932964ca6fac768a (patch) | |
tree | c166e9d77bc83af51588889a095b965e0e5a9228 | |
parent | ae49073b17dce79e1f5123e854f0b78eebf0fdff (diff) | |
parent | 5cc6420f07487a49b2b95e06b2dce6174f06b87d (diff) | |
download | unicode-segmentation-e0f613332231d7b60a758820932964ca6fac768a.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 270d389bbe am: fde697d305 am: 5cc6420f07
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-segmentation/+/1912509
Change-Id: I5ed8a39fac4a309f5ed1b3a1d455cfed185dd933
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 21 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 18 insertions, 11 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -44,6 +44,8 @@ rust_library { name: "libunicode_segmentation", host_supported: true, crate_name: "unicode_segmentation", + cargo_env_compat: true, + cargo_pkg_version: "1.8.0", srcs: ["src/lib.rs"], edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index 5dacebd..c934591 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,21 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "authfs_device_test_src_lib" - }, + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" - }, + "path": "external/rust/crates/heck" + } + ], + "presubmit": [ { - "name": "base64_device_test_tests_helpers" - }, + "name": "authfs_device_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "heck_device_test_src_lib" + "name": "authfs_device_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |