aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 19:28:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 19:28:28 +0000
commita54971020a7d84723a147ca568d300363aa758f7 (patch)
tree3315405c216c4173af9f5e918430b4da07bbeb0f
parenta7ed7cc82804530af86c075f0665dece70267733 (diff)
parentd5b7c5c58a85d779eb1c7a13e3ee05937908ab07 (diff)
downloadvhost-a54971020a7d84723a147ca568d300363aa758f7.tar.gz
Migrate to cargo_embargo. am: b69d9a4fee am: d5b7c5c58a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vhost/+/2824690 Change-Id: I228668c88a27900ad2a788ddc4b01b486de5c219 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json18
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
+}