Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c14d32c87a am: dcbe6e1bb2 am: ee0c6e14f2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde-xml-rs/+/1912687
Change-Id: Ifa9eac83d363a22a3842ccc411e2a520e45c14c9
diff --git a/Android.bp b/Android.bp
index 770a90a..7d1bd7b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,15 +39,19 @@
],
}
-rust_defaults {
- name: "serde-xml-rs_test_defaults",
- crate_name: "serde_xml_rs",
+rust_test {
+ name: "serde-xml-rs_test_src_lib",
// has rustc warnings
- srcs: ["src/lib.rs"],
+ host_supported: true,
+ crate_name: "serde_xml_rs",
cargo_env_compat: true,
cargo_pkg_version: "0.5.1",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
rustlibs: [
"liblog_rust",
@@ -57,16 +61,3 @@
],
proc_macros: ["libserde_derive"],
}
-
-rust_test_host {
- name: "serde-xml-rs_host_test_src_lib",
- defaults: ["serde-xml-rs_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "serde-xml-rs_device_test_src_lib",
- defaults: ["serde-xml-rs_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b4bf380..019c527 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,15 @@
{
"presubmit": [
{
- "name": "serde-xml-rs_device_test_src_lib"
+ "name": "serde-xml-rs_test_src_lib"
+ },
+ {
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "serde-xml-rs_test_src_lib"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 31f8835..d735201 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,12 +8,12 @@
"simple_logger"
],
"device": true,
+ "run": true,
"test-blocklist": [
"tests/failures.rs",
"tests/migrated.rs",
"tests/round_trip.rs",
"tests/test.rs"
],
- "tests": true,
- "run": true
-}
+ "tests": true
+}
\ No newline at end of file