Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4f5cf36e0a am: b53aecc3bd am: ca61606cba am: fcd4145107
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/peeking_take_while/+/1912006
Change-Id: I1fcf6d1d5fd378dfc6c60c00f4326f9fd13c0e2b
diff --git a/Android.bp b/Android.bp
index 0c1448a..c6e70cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -50,27 +50,18 @@
edition: "2018",
}
-rust_defaults {
- name: "peeking_take_while_test_defaults",
- crate_name: "peeking_take_while",
+rust_test {
+ name: "peeking_take_while_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "peeking_take_while",
cargo_env_compat: true,
cargo_pkg_version: "1.0.0",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2018",
-}
-
-rust_test_host {
- name: "peeking_take_while_host_test_src_lib",
- defaults: ["peeking_take_while_test_defaults"],
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "peeking_take_while_device_test_src_lib",
- defaults: ["peeking_take_while_test_defaults"],
+ edition: "2018",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d23e52b..f9ce301 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -13,7 +13,18 @@
"name": "legacykeystore_test"
},
{
- "name": "peeking_take_while_device_test_src_lib"
+ "name": "peeking_take_while_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "keystore2_test"
+ },
+ {
+ "name": "legacykeystore_test"
+ },
+ {
+ "name": "peeking_take_while_test_src_lib"
}
]
}
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
