diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-10 19:01:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 19:01:50 +0000 |
commit | cb8e7cdec3545a5b512c4e58d22dd05891a7b7a3 (patch) | |
tree | 726bd174e7f88507130c7765f17cbbd705644b09 | |
parent | 6991668bb5ec71d78e2345ba11fdbeb22ef79595 (diff) | |
parent | 2da458f4834951b2c4d4b49913e215eb69d438ba (diff) | |
download | ciborium-cb8e7cdec3545a5b512c4e58d22dd05891a7b7a3.tar.gz |
Migrate to cargo_embargo. am: 486fd8ae36 am: 2da458f483
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium/+/2824516
Change-Id: I8ab5b2526f0e702e84b918b8f5812508db7ea587
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 | 21 | ||||
-rw-r--r-- | cargo_embargo.json | 23 |
3 files changed, 24 insertions, 22 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 d457e20..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "device": true, - "run": true, - "dependencies": true, - "variants": [ - {}, - { - "alloc": true, - "dep-suffixes": { - "ciborium_io": "_nostd", - "ciborium_ll": "_nostd", - "serde": "_nostd" - }, - "features": "", - "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..8380dba --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,23 @@ +{ + "run_cargo": false, + "variants": [ + {}, + { + "features": [], + "module_name_overrides": { + "libciborium": "libciborium_nostd", + "libciborium_io": "libciborium_io_nostd", + "libciborium_ll": "libciborium_ll_nostd", + "libserde": "libserde_nostd" + }, + "package": { + "ciborium": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |