Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 88fac7b76f am: dba66ab262 am: 94531d70f6 am: d9237df943
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/1912601
Change-Id: Ifa7793a06ea2d728e4104ecd54b6649bbbe6d0d7
diff --git a/Android.bp b/Android.bp
index 12d9f35..1cbd146 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -37,12 +37,18 @@
],
}
-rust_defaults {
- name: "either_defaults",
+rust_test {
+ name: "either_test_src_lib",
+ host_supported: true,
crate_name: "either",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.6.1",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
features: [
"default",
@@ -53,23 +59,12 @@
],
}
-rust_test_host {
- name: "either_host_test_src_lib",
- defaults: ["either_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "either_device_test_src_lib",
- defaults: ["either_defaults"],
-}
-
rust_library {
name: "libeither",
host_supported: true,
crate_name: "either",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.6.1",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -78,8 +73,5 @@
],
}
-// dependent_library ["feature_list"]
-// itoa-0.4.7
-// ryu-1.0.5
-// serde-1.0.123 "std"
-// serde_json-1.0.64 "default,std"
+//Non fatal errors:
+// error: test
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 359e921..149c80f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,35 +1,48 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "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"
},
{
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "either_device_test_src_lib"
+ "name": "either_test_src_lib"
},
{
"name": "keystore2_test"
},
{
"name": "legacykeystore_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "apkdmverity.test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
+ "name": "either_test_src_lib"
},
{
- "name": "libsqlite3_bindgen_test"
+ "name": "keystore2_test"
},
{
- "name": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "legacykeystore_test"
}
]
}
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
