diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-13 19:23:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-13 19:23:11 +0000 |
commit | 83a2c00b1553d7013c6d65ea7de5b59c957b026f (patch) | |
tree | e95f4cad08979daf16da90a2b3c719cd432c65a2 | |
parent | 40955a7e2f08abd692bc3e40235f85978f5e054d (diff) | |
parent | 024a3a5ef66a6b12e6906fe507f0cea104d25614 (diff) | |
download | der-83a2c00b1553d7013c6d65ea7de5b59c957b026f.tar.gz |
Migrate to cargo_embargo. am: 024a3a5ef6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der/+/2824777
Change-Id: Ib4ebb225d1a7f6293794ab0cb6e844d1c101a8c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 18 | ||||
-rw-r--r-- | cargo2android.json | 27 | ||||
-rw-r--r-- | cargo_embargo.json | 40 |
3 files changed, 49 insertions, 36 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 { @@ -91,12 +91,12 @@ rust_library_rlib { product_available: true, vendor_available: true, visibility: [ - "//external/rust/crates/sec1:__subpackages__", - "//external/rust/crates/spki:__subpackages__", - "//external/rust/crates/pkcs1:__subpackages__", - "//external/rust/crates/pkcs8:__subpackages__", - "//external/rust/crates/x509-cert:__subpackages__", - "//system/keymint:__subpackages__", - ] - , + "//external/rust/crates/sec1:__subpackages__", + "//external/rust/crates/spki:__subpackages__", + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/pkcs8:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 219392f..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,derive,flagset,oid,zeroize", - "variants": [ - { - }, - { - "device": true, - "alloc": true, - "no-host": true, - "add-module-block": "cargo2android_viz.bp", - "dep-suffixes": { - "const_oid": "_nostd", - "flagset": "_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..61bd3ea --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,40 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "features": [ + "alloc", + "derive", + "flagset", + "oid", + "zeroize" + ], + "run_cargo": false, + "variants": [ + { + "package": { + "der": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libconst_oid": "libconst_oid_nostd", + "libder": "libder_nostd", + "libflagset": "libflagset_nostd", + "libzeroize": "libzeroize_nostd" + }, + "package": { + "der": { + "add_module_block": "cargo2android_viz.bp", + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |