Merge 0ddf37c48b8d3af9cde1e8368cc16b37a8e3271b on remote branch
Change-Id: I37f06c81278dc5fc21d793cad1f659cad55f7a00
diff --git a/Android.bp b/Android.bp
index 963b929..ba23bc5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 @@
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 @@
"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.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ }
+ ],
"presubmit": [
{
- "name": "base64_device_test_tests_decode"
- },
+ "name": "apkdmverity.test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "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