From ba08b5b7c3090f210a6a32a179fbe2de04202826 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 9 Nov 2023 17:57:57 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Icdc0f3a35210c89706131c96f11bad371c1c6722 --- Android.bp | 4 +--- cargo2android.json | 7 ------- cargo_embargo.json | 12 ++++++++++++ 3 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index 487cdd1..29f13dd 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_user_backend", crate_name: "vhost_user_backend", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6f1f3ce..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "run": true, - "dep-suffixes": { - "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..2a9a0a7 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,12 @@ +{ + "module_name_overrides": { + "libvhost": "libvhost_android", + "libvm_memory": "libvm_memory_android" + }, + "package": { + "vhost-user-backend": { + "device_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3