aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-07-16 19:20:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-16 19:20:34 +0000
commitacc47ca2c52fb86fb1fcb91fcc33354d7698186e (patch)
treef2b58bf848f0e758f307983f8ac1ab07a33111c0
parentec6c59dae6e08f642e2776e9245fc52d5c8eac75 (diff)
parent731ac223a90df93b7038f49f7205bacb1e4c6c5d (diff)
downloadserde-xml-rs-acc47ca2c52fb86fb1fcb91fcc33354d7698186e.tar.gz
Enable tests am: d34029dbb9 am: a8c4dce319 am: 0bee7721a3 am: 731ac223a9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde-xml-rs/+/1768549 Change-Id: I933dac9c2fa72662198e2e0cf698fa3027518696
-rw-r--r--Android.bp72
-rw-r--r--cargo2android.json12
2 files changed, 72 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index 9f9da03..ab214f8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,6 +5,7 @@
rust_library {
name: "libserde_xml_rs",
+ // has rustc warnings
host_supported: true,
crate_name: "serde_xml_rs",
srcs: ["src/lib.rs"],
@@ -21,14 +22,63 @@ rust_library {
],
}
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
-// log-0.4.14 "std"
-// proc-macro2-1.0.27 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// serde-1.0.126 "default,std"
-// syn-1.0.73 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// thiserror-1.0.26
-// thiserror-impl-1.0.26
-// unicode-xid-0.2.2 "default"
-// xml-rs-0.8.3
+rust_defaults {
+ name: "serde-xml-rs_test_defaults",
+ crate_name: "serde_xml_rs",
+ // has rustc warnings
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ rustlibs: [
+ "liblog_rust",
+ "libserde",
+ "libthiserror",
+ "libxml_rust",
+ ],
+ 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"],
+}
+
+rust_defaults {
+ name: "serde-xml-rs_test_defaults_serde_xml_rs",
+ crate_name: "serde_xml_rs",
+ // has rustc warnings
+ srcs: ["tests/round_trip.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ rustlibs: [
+ "liblog_rust",
+ "libserde",
+ "libserde_xml_rs",
+ "libthiserror",
+ "libxml_rust",
+ ],
+ proc_macros: ["libserde_derive"],
+}
+
+rust_test_host {
+ name: "serde-xml-rs_host_test_tests_round_trip",
+ defaults: ["serde-xml-rs_test_defaults_serde_xml_rs"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "serde-xml-rs_device_test_tests_round_trip",
+ defaults: ["serde-xml-rs_test_defaults_serde_xml_rs"],
+}
diff --git a/cargo2android.json b/cargo2android.json
index 42b7833..7dc0a63 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,7 +3,17 @@
"//apex_available:platform",
"com.android.virt"
],
- "dependencies": true,
+ "dependency-blocklist": [
+ "docmatic",
+ "simple_logger"
+ ],
"device": true,
+ "test-blocklist": [
+ "tests/failures.rs",
+ "tests/migrated.rs",
+ "tests/readme.rs",
+ "tests/test.rs"
+ ],
+ "tests": true,
"run": true
} \ No newline at end of file