From 8d5dcb1f6d77a058f113efdebd4cc635678bb758 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 20 Nov 2023 13:21:57 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I58fc7232dee8986e71607ebbd85be4a73dcb20be --- 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 e72fe88..75c7bbd 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: "libvmm_sys_util", crate_name: "vmm_sys_util", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 1f2fa38..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "run": true, - "dep-suffixes": { - "bitflags": "-1.3.2" - } -} \ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..bc1c4ce --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "module_name_overrides": { + "libbitflags": "libbitflags-1.3.2" + }, + "package": { + "vmm-sys-util": { + "device_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3