aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 15:28:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 15:28:50 +0000
commit0f4e628dca4438832bda56bc3b21b71ce27f64a4 (patch)
tree90fe542f3033b6c3b042478741646823786437fe
parentc9e306cfb8a45d940fca4a17b4d436ffc735d9ff (diff)
parent8f17a512208c06b3d94b194b08d4142612d6339f (diff)
downloadvhost-device-vsock-0f4e628dca4438832bda56bc3b21b71ce27f64a4.tar.gz
Migrate to cargo_embargo. am: 8f17a51220
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vhost-device-vsock/+/2824790 Change-Id: Ieb1ce379a69ba03799c414abd87a27a5800cc626 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json13
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
+}