Snap for 11120126 from 7cc2b15cd483b3204c5b8c2d4b8f0b9c27ffe903 to 24Q1-release

Change-Id: I5dfcd93c0b3a2efd4ca27b87f1cd102935acfa4e

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
+}