Snap for 11097608 from b633725a58e4592cdd7916297e50bf7b42748374 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I466da0449e9b4b3e7d02b56250b7502251ce25d7

3 files changed, 12 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 83d3ed5..8e6354a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_library_host {
     name: "libvirtio_queue",
     crate_name: "virtio_queue",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 3c5fa7e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "run": true,
-    "dep-suffixes": {
-      "vm_memory": "_android"
-    }
-  }
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..31753da
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "module_name_overrides": {
+    "libvm_memory": "libvm_memory_android"
+  },
+  "package": {
+    "virtio-queue": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false
+}