diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-14 18:30:46 +0000 |
---|---|---|
committer | Andrew Walbran <qwandor@google.com> | 2023-11-14 18:30:46 +0000 |
commit | 12db4175475cd94b89e20a804910377f9edf01f3 (patch) | |
tree | 9473a9cc7407e0e176f076ea487545ef08b721c4 | |
parent | 9fd1eba405765787d44b38df35b2a2afab44ce1a (diff) | |
download | pkcs1-12db4175475cd94b89e20a804910377f9edf01f3.tar.gz |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I59aa7b5aa39913af077fe24a735edd0d8ddeb117
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cargo2android.json | 27 | ||||
-rw-r--r-- | cargo_embargo.json | 36 |
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 { @@ -82,7 +82,7 @@ rust_library_rlib { product_available: true, vendor_available: true, visibility: [ - "//system/keymint:__subpackages__", - ] - , + "//system/keymint:__subpackages__", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 2135340..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,27 +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", - "pkcs8": "_nostd", - "spki": "_nostd", - "zeroize": "_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..1a8911c --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,36 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [ + "alloc" + ], + "run_cargo": false, + "variants": [ + { + "package": { + "pkcs1": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libder": "libder_nostd", + "libpkcs1": "libpkcs1_nostd", + "libpkcs8": "libpkcs8_nostd", + "libspki": "libspki_nostd", + "libzeroize": "libzeroize_nostd" + }, + "package": { + "pkcs1": { + "add_module_block": "cargo2android_viz.bp", + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |