aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 22:31:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-17 22:31:22 +0000
commit3b428f890b79f22e0ca79d63ed7a518fde152f8e (patch)
tree673ee4b49c01309ff9d84305ed3418d9f3d3d7fd
parent2061721732b5879e9b616a6d1a4cc2469d5f036f (diff)
parent10ed1a63ae8681b34cd6e43899ceb9ee3ae4dc11 (diff)
downloadxml-rs-3b428f890b79f22e0ca79d63ed7a518fde152f8e.tar.gz
Migrate to cargo_embargo. am: 10ed1a63ae
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/xml-rs/+/2835712 Change-Id: I5911dadfda0447f2efe43d8f9bf9dad41bcb3aa6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp22
-rw-r--r--cargo2android.json15
-rw-r--r--cargo_embargo.json14
3 files changed, 31 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp
index 16b2b9a..807ac43 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -20,7 +20,6 @@ license {
rust_library {
name: "libxml_rust",
- stem: "libxml",
host_supported: true,
crate_name: "xml",
cargo_env_compat: true,
@@ -35,6 +34,21 @@ rust_library {
vendor_available: true,
}
+rust_test {
+ name: "xml-rs_test_src_lib",
+ host_supported: true,
+ crate_name: "xml",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.8.15-cvss-cries-wolf",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2021",
+}
+
rust_binary {
name: "xml_analyze",
host_supported: true,
@@ -43,9 +57,7 @@ rust_binary {
cargo_pkg_version: "0.8.15-cvss-cries-wolf",
srcs: ["src/analyze.rs"],
edition: "2021",
- rustlibs: [
- "libxml_rust",
- ],
+ rustlibs: ["libxml_rust"],
product_available: true,
vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 24ca9c1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "apex-available": [
- "//apex_available:platform",
- "com.android.virt"
- ],
- "dependency-blocklist": [
- "doc_comment"
- ],
- "device": true,
- "run": true,
- "test-data": [
- "tests/event_writer.rs=tests/documents/*"
- ],
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f6ad908
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+ "apex_available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "package": {
+ "xml-rs": {
+ "dep_blocklist": [
+ "libdoc_comment"
+ ]
+ }
+ },
+ "tests": true
+}