From 318d0a17a7ea62256c9a4f7607a0c1fb5dc28a27 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:28:56 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Id419fabf75ce453bbc9ca45f98166750ecaaa28d --- Android.bp | 4 +--- cargo2android.json | 6 ------ cargo_embargo.json | 11 +++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 8b0ce37..2c49229 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_vsock", crate_name: "virtio_vsock", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 4241aa2..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..7edff07 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "module_name_overrides": { + "libvm_memory": "libvm_memory_android" + }, + "package": { + "virtio-vsock": { + "device_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3