diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-13 19:18:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-13 19:18:30 +0000 |
commit | 9637d6faa0f071896ba2d73b0382039048b37a45 (patch) | |
tree | 71284f06c1f3802a5347905922d63d075ce9bc7f | |
parent | ad359bdf5dc11483d8490e7d0146d09b9e0660d7 (diff) | |
parent | 5f2cd90e6481497260b9d85cc0df5ea4377d70f1 (diff) | |
download | ciborium-ll-9637d6faa0f071896ba2d73b0382039048b37a45.tar.gz |
Migrate to cargo_embargo. am: 5f2cd90e64
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ciborium-ll/+/2824518
Change-Id: Iaaf099a4a681503a7a28cdfbd9370a8267d22051
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 639f806..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "device": true, - "run": true, - "dependencies": true, - "variants": [ - { - "tests": true - }, - { - "alloc": true, - "dep-suffixes": { - "ciborium_io": "_nostd", - "half": "_nostd" - }, - "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..b2ac6c1 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,23 @@ +{ + "run_cargo": false, + "variants": [ + { + "tests": true + }, + { + "module_name_overrides": { + "libciborium_io": "libciborium_io_nostd", + "libciborium_ll": "libciborium_ll_nostd", + "libhalf": "libhalf_nostd" + }, + "package": { + "ciborium-ll": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |