Snap for 11097608 from 2cbb10c1a177e5723db74a163dcab1b2a24cbf42 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_r29android-14.0.0_r28android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I819cc43fd307c5e90eea5a433b9477bc6da7aacc

3 files changed, 19 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index d5c963e..6060217 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: "libvhost_android",
     crate_name: "vhost",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f3781ef..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "run": true,
-  "name-suffix": "_android",
-  "features": "default,vhost-user,vhost-user-slave",
-  "dep-suffixes": {
-    "bitflags": "-1.3.2",
-    "vm_memory": "_android"
-  }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3f73d27
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,18 @@
+{
+  "features": [
+    "default",
+    "vhost-user",
+    "vhost-user-slave"
+  ],
+  "module_name_overrides": {
+    "libbitflags": "libbitflags-1.3.2",
+    "libvhost": "libvhost_android",
+    "libvm_memory": "libvm_memory_android"
+  },
+  "package": {
+    "vhost": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false
+}