aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 19:01:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 19:01:19 +0000
commitc74102c404fdf382693b76eed6ad2101672e7967 (patch)
tree2b03e15d71c0003a68fdb16c9edce14edca8cee6
parent7b9481e0a689716d41a3ea2f02c62035acd1204b (diff)
parentb0e70a3aab4c7b853c67bdb95083263bcbceae27 (diff)
downloadvirtio-queue-c74102c404fdf382693b76eed6ad2101672e7967.tar.gz
Migrate to cargo_embargo. am: b0e70a3aab
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/virtio-queue/+/2828193 Change-Id: Ie7e4e4212dc63c79fce499bf7872446a2302a171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json6
-rw-r--r--cargo_embargo.json11
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
+}