diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-14 20:42:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 20:42:04 +0000 |
| commit | 78de77fd52f8d0e6f9a30e057c484a7b2438b689 (patch) | |
| tree | edd329f8f1b316acffd869e604d10b8a5268fedf | |
| parent | fd945d7df65b90a89ab4d4a62cb7b46c658ac501 (diff) | |
| parent | c796a10e2180b32707d864f7a4dcda17ec593b58 (diff) | |
| download | pkcs8-78de77fd52f8d0e6f9a30e057c484a7b2438b689.tar.gz | |
Migrate to cargo_embargo. am: c796a10e21
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pkcs8/+/2828015
Change-Id: I01fbe55f0e983eba03814bfe1400316a9d99c9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 25 | ||||
| -rw-r--r-- | cargo_embargo.json | 34 |
3 files changed, 40 insertions, 31 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 { @@ -70,9 +70,9 @@ rust_library_rlib { product_available: true, vendor_available: true, visibility: [ - "//external/rust/crates/pkcs1:__subpackages__", - "//external/rust/crates/sec1:__subpackages__", - "//system/keymint:__subpackages__", - ] - , + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/sec1:__subpackages__", + "//system/keymint:__subpackages__", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index aa2b569..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "run": true, - "vendor-available": true, - "features": "alloc", - "variants": [ - { - }, - { - "device": true, - "no-host": true, - "add-module-block": "cargo2android_viz.bp", - "dep-suffixes": { - "der": "_nostd", - "spki": "_nostd" - }, - "force-rlib": true, - "suffix": "_nostd", - "no-std": true - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9d1cec5 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,34 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [ + "alloc" + ], + "run_cargo": false, + "variants": [ + { + "package": { + "pkcs8": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libder": "libder_nostd", + "libpkcs8": "libpkcs8_nostd", + "libspki": "libspki_nostd" + }, + "package": { + "pkcs8": { + "add_module_block": "cargo2android_viz.bp", + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |