From 9d79354ae35087ee1e0790ec83c67d56bff2493b Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Mon, 13 Nov 2023 17:13:23 +0000 Subject: Migrate to cargo_embargo. Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I5f993105d6861c98f452179255fbab25b19b72a6 --- Android.bp | 6 ++---- cargo2android.json | 11 ----------- cargo_embargo.json | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 cargo2android.json create mode 100644 cargo_embargo.json diff --git a/Android.bp b/Android.bp index f148121..b5e9625 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,4 @@ -// 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. package { @@ -49,9 +49,7 @@ rust_library { "serde", "std", ], - rustlibs: [ - "libserde", - ], + rustlibs: ["libserde"], apex_available: [ "//apex_available:platform", "com.android.virt", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index f441aa9..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "dependencies": true, - "device": true, - "no-host": true, - "run": true, - "features": "default,std,serde" -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..a2ca437 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,17 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [ + "default", + "std", + "serde" + ], + "package": { + "semver": { + "host_supported": false + } + }, + "run_cargo": false +} -- cgit v1.2.3