diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-13 00:16:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-13 00:16:06 +0000 |
commit | ac049cdcd00eff6a332ba8901ae0b003a22e269a (patch) | |
tree | 09dd12640f661cbbb57d1d008986ad6694332589 | |
parent | 4e86e8fcee6a681cf21bf572d25392a61fe99ee9 (diff) | |
parent | 8dab05e2bc8e7f65b18420e27be2c0de77832684 (diff) | |
download | ciborium-io-ac049cdcd00eff6a332ba8901ae0b003a22e269a.tar.gz |
Migrate to cargo_embargo. am: 97bf312e35 am: 8dab05e2bc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-io/+/2824416
Change-Id: Ic7b37f6652829f6cf4c105d8f9c6364b5f231e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 18 | ||||
-rw-r--r-- | cargo_embargo.json | 27 |
3 files changed, 28 insertions, 19 deletions
@@ -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 { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 429052c..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "device": true, - "run": true, - "dependencies": true, - "variants": [ - { - "features": "alloc,std" - }, - { - "alloc": true, - "features": "alloc", - "force-rlib": true, - "no-host": true, - "suffix": "_nostd", - "no-std": true - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..560a629 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,27 @@ +{ + "run_cargo": false, + "variants": [ + { + "features": [ + "alloc", + "std" + ] + }, + { + "features": [ + "alloc" + ], + "module_name_overrides": { + "libciborium_io": "libciborium_io_nostd" + }, + "package": { + "ciborium-io": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |