Snap for 11111096 from 66860b37c4858593eed44ed1ae9bef061e771cc3 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ic36eda18d592fc7dd3b8bd5cd26adb0b802d544f

3 files changed, 24 insertions, 22 deletions

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