diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-10 19:34:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 19:34:51 +0000 |
| commit | 4fbd00e6f55a77b5d5002a821722ef7658e8ed17 (patch) | |
| tree | fb19b5419f62feb7a59090d050078ff1d09f9a3f | |
| parent | 0e6af3dddb12509e2db11d6a08fdce2b7bde137a (diff) | |
| parent | a81395418b1130c9c0e35af5ddd02bdec56e12f5 (diff) | |
| download | coset-4fbd00e6f55a77b5d5002a821722ef7658e8ed17.tar.gz | |
Migrate to cargo_embargo. am: 368bdc010c am: a81395418b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/coset/+/2824642
Change-Id: I10970ea8d17e722099e4950b6f09e61fdd9adb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 25 | ||||
| -rw-r--r-- | cargo_embargo.json | 28 |
3 files changed, 30 insertions, 27 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 { @@ -74,8 +74,8 @@ rust_library_rlib { srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ - "libciborium_nostd", "libciborium_io_nostd", + "libciborium_nostd", ], apex_available: [ "//apex_available:platform", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 197a426..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "device": true, - "run": true, - "dependencies": true, - "vendor-available": true, - "tests": true, - "variants": [ - { - "features": "default,std" - }, - { - "alloc": true, - "dep-suffixes": { - "ciborium": "_nostd", - "ciborium_io": "_nostd" - }, - "features": "", - "force-rlib": true, - "no-host": true, - "suffix": "_nostd", - "no-std": true, - "tests": false - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..65de91c --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,28 @@ +{ + "run_cargo": false, + "variants": [ + { + "features": [ + "default", + "std" + ], + "tests": true + }, + { + "features": [], + "module_name_overrides": { + "libciborium": "libciborium_nostd", + "libciborium_io": "libciborium_io_nostd", + "libcoset": "libcoset_nostd" + }, + "package": { + "coset": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |