From 888635dbe0a01ba7b08296060617fe65a0204e44 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Wed, 15 Nov 2023 17:12:37 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I2fa64bbed5a8f8c0032d2bd7155fd839b2f21c30
---
 Android.bp         |  2 +-
 cargo2android.json | 21 ---------------------
 cargo_embargo.json | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 3a2d26c..0e41e99 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 3223434..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependency-blocklist": [
-    "docmatic",
-    "rstest",
-    "simple_logger"
-  ],
-  "device": true,
-  "run": true,
-  "test-blocklist": [
-    "tests/datatypes.rs",
-    "tests/failures.rs",
-    "tests/migrated.rs",
-    "tests/round_trip.rs",
-    "tests/test.rs"
-  ],
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fea6f74
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,23 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "module_blocklist": [
+    "serde-xml-rs_test_tests_datatypes",
+    "serde-xml-rs_test_tests_failures",
+    "serde-xml-rs_test_tests_migrated",
+    "serde-xml-rs_test_tests_round_trip",
+    "serde-xml-rs_test_tests_test"
+  ],
+  "package": {
+    "serde-xml-rs": {
+      "dep_blocklist": [
+        "libdocmatic",
+        "librstest",
+        "libsimple_logger"
+      ]
+    }
+  },
+  "tests": true
+}
-- 
cgit v1.2.3