diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-20 00:37:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 00:37:10 +0000 |
| commit | 830210117aa862626caea8d922eb0ce7654f0a0a (patch) | |
| tree | e1e2ae4bd72f62535c8154cd50081ebf4b47030b | |
| parent | f0d81055f5f3a09fb0308d036d741911fd45f482 (diff) | |
| parent | f07906c448b65c149e744fc31e0d14618be11198 (diff) | |
| download | x509-cert-830210117aa862626caea8d922eb0ce7654f0a0a.tar.gz | |
Migrate to cargo_embargo. am: 7595d00f7e am: 938152d229 am: f07906c448
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-cert/+/2836755
Change-Id: I6226e42f710d7a176bfba9ab5a64c1583710b4ec
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 | 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 { @@ -74,7 +74,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 76c47df..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": { - "const_oid": "_nostd", - "der": "_nostd", - "flagset": "_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..9351aed --- /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": { + "x509-cert": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libconst_oid": "libconst_oid_nostd", + "libder": "libder_nostd", + "libflagset": "libflagset_nostd", + "libspki": "libspki_nostd", + "libx509_cert": "libx509_cert_nostd" + }, + "package": { + "x509-cert": { + "add_module_block": "cargo2android_viz.bp", + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |