Snap for 11084970 from 10ede790c557c689dd9c58af4398747bed6ffba6 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: Id54b8c5f547e5f35e388bcf98a78144b609ef3dc

3 files changed, 14 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 5e7a4bf..5b01cd6 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_binary_host {
     name: "vhost_device_vsock",
     crate_name: "vhost_device_vsock",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index cb73581..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "run": true,
-  "dep-suffixes": {
-    "config": "_rust",
-    "vhost": "_android",
-    "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..1ce74b1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "module_name_overrides": {
+    "libconfig": "libconfig_rust",
+    "libvhost": "libvhost_android",
+    "libvm_memory": "libvm_memory_android"
+  },
+  "package": {
+    "vhost-device-vsock": {
+      "device_supported": false
+    }
+  },
+  "run_cargo": false
+}