summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 17:27:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 17:27:39 +0000
commit6715eff3d10f3294c1f01e5e96edcb9f749dc890 (patch)
tree633388388ffa36affcd460e20d5b523ced5f9e4e
parent2acd400facc1064e8667876b2623567ada6addb5 (diff)
parent2f450a49c3e8380e36f11f2a500f847764ecbefe (diff)
downloadidna-6715eff3d10f3294c1f01e5e96edcb9f749dc890.tar.gz
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: cd15b12eb2 am: 7dc8b3ddfa am: 2f450a49c3
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/idna/+/1912732 Change-Id: I1633bdab2958a955b5b6ffa7796a0fa3d7771ce9
-rw-r--r--Android.bp9
-rw-r--r--TEST_MAPPING21
2 files changed, 13 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index 8661d79..1838279 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ rust_library {
name: "libidna",
host_supported: true,
crate_name: "idna",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.3",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -54,10 +56,3 @@ rust_library {
],
min_sdk_version: "29",
}
-
-// dependent_library ["feature_list"]
-// matches-0.1.8
-// tinyvec-1.2.0 "alloc,default,tinyvec_macros"
-// tinyvec_macros-0.1.0
-// unicode-bidi-0.3.5 "default"
-// unicode-normalization-0.1.17 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index be39865..407ec5c 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": "doh_unit_test"
- },
+ "imports": [
{
- "name": "quiche_device_test_src_lib"
+ "path": "external/rust/crates/quiche"
},
{
- "name": "url_device_test_src_lib"
- },
+ "path": "external/rust/crates/url"
+ }
+ ],
+ "presubmit": [
{
- "name": "url_device_test_tests_data"
- },
+ "name": "doh_unit_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "url_device_test_tests_unit"
+ "name": "doh_unit_test"
}
]
}