diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:37 +0000 |
| commit | ee0c6e14f240608c3effdf1c153478ac7844cb7c (patch) | |
| tree | 4cc3dcf01cb697f27e3259054911f12121c7a726 | |
| parent | b5109b4cad03766c24e8035fb0409270029b8e68 (diff) | |
| parent | dcbe6e1bb2e2a65e27a2b8b9bce0f7c985bcd4b6 (diff) | |
| download | serde-xml-rs-ee0c6e14f240608c3effdf1c153478ac7844cb7c.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c14d32c87a am: dcbe6e1bb2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde-xml-rs/+/1912687
Change-Id: I85fe26def65a1e744a8eb12797f2f0a533bd250c
| -rw-r--r-- | Android.bp | 25 | ||||
| -rw-r--r-- | TEST_MAPPING | 10 | ||||
| -rw-r--r-- | cargo2android.json | 6 |
3 files changed, 20 insertions, 21 deletions
@@ -39,15 +39,19 @@ rust_library { ], } -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 @@ rust_defaults { ], 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 |