diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:16 +0000 |
commit | 06008b1422d65fa2c8d862b9f5ef126b728fa6b8 (patch) | |
tree | 25862208f2285f3ccbb9bffcdd3caac953958261 | |
parent | c851d71e64033ec86fd0e06e3220e11be306fd36 (diff) | |
parent | c89ee31edfe2d241e9cbed692c71047a5ff9a03e (diff) | |
download | itertools-06008b1422d65fa2c8d862b9f5ef126b728fa6b8.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 80f1e87637 am: c89ee31edf
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/itertools/+/1912676
Change-Id: Ic94dbfec7000c67927e269cb7af8fbc4ac83f8db
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | TEST_MAPPING | 21 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 22 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 { @@ -39,8 +39,11 @@ license { rust_library { name: "libitertools", + // has rustc warnings host_supported: true, crate_name: "itertools", + cargo_env_compat: true, + cargo_pkg_version: "0.10.1", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -52,6 +55,3 @@ rust_library { "libeither", ], } - -// dependent_library ["feature_list"] -// either-1.6.1 diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..f6e148f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,27 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/tinytemplate" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_src_lib" - }, + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { + "name": "apkdmverity.test" + } + ], + "presubmit-rust": [ { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "apkdmverity.test" } ] } 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 |