diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-15 21:35:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-15 21:35:46 +0000 |
| commit | 081c77e2c706db0fd7f2c297ca9b0aeb5019f174 (patch) | |
| tree | 4a0798ba9bdba706ed2cd73db3fe4182f23ad543 | |
| parent | 5424e5b939f320a272ff2ed1cb34d5c27d8203d1 (diff) | |
| parent | e945d9e279f30470a09e31ef60cbb79a659b6839 (diff) | |
| download | sec1-081c77e2c706db0fd7f2c297ca9b0aeb5019f174.tar.gz | |
Migrate to cargo_embargo. am: ade89fb953 am: 87944b508d am: e945d9e279
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/sec1/+/2832812
Change-Id: I94ebfde90c7433a46526d1d7f6c8859e5087a39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | cargo2android.json | 26 | ||||
| -rw-r--r-- | cargo_embargo.json | 37 |
3 files changed, 41 insertions, 30 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 bdfb1f5..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "run": true, - "vendor-available": true, - "features": "alloc,der,pkcs8", - "variants": [ - { - }, - { - "device": true, - "no-host": true, - "add-module-block": "cargo2android_viz.bp", - "dep-suffixes": { - "der": "_nostd", - "pkcs8": "_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..fae434d --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,37 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [ + "alloc", + "der", + "pkcs8" + ], + "run_cargo": false, + "variants": [ + { + "package": { + "sec1": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libder": "libder_nostd", + "libpkcs8": "libpkcs8_nostd", + "libsec1": "libsec1_nostd", + "libzeroize": "libzeroize_nostd" + }, + "package": { + "sec1": { + "add_module_block": "cargo2android_viz.bp", + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |