diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-28 01:47:09 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-28 01:47:09 +0000 |
commit | ad1804e8a666a7ae4c5d20962c168f17790b563f (patch) | |
tree | 6ec43135ba3e4fdd9b916c554301da40521086a6 | |
parent | 272ad1c8f88aa05c6b9aef0bebf91c6b7d4c3b3c (diff) | |
parent | 874fbdbc8b1aaff9cf4ac6571554c8f827d38075 (diff) | |
download | spki-ad1804e8a666a7ae4c5d20962c168f17790b563f.tar.gz |
Snap for 11147182 from 874fbdbc8b1aaff9cf4ac6571554c8f827d38075 to build-tools-release
Change-Id: I92a64ed4287e86bc001b286da257079dbec010da
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | cargo2android.json | 25 | ||||
-rw-r--r-- | cargo2android_viz.bp | 1 | ||||
-rw-r--r-- | cargo_embargo.json | 34 |
4 files changed, 45 insertions, 38 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 { @@ -39,9 +39,7 @@ rust_library_host { srcs: ["src/lib.rs"], edition: "2021", features: ["alloc"], - rustlibs: [ - "libder", - ], + rustlibs: ["libder"], } rust_library_rlib { @@ -52,9 +50,7 @@ rust_library_rlib { srcs: ["src/lib.rs"], edition: "2021", features: ["alloc"], - rustlibs: [ - "libder_nostd", - ], + rustlibs: ["libder_nostd"], apex_available: [ "//apex_available:platform", "com.android.virt", @@ -69,10 +65,11 @@ rust_library_rlib { product_available: true, vendor_available: true, visibility: [ - "//external/rust/crates/pkcs1:__subpackages__", - "//external/rust/crates/pkcs8:__subpackages__", - "//external/rust/crates/x509-cert:__subpackages__", - "//system/keymint:__subpackages__", - ] - , + "//external/rust/crates/pkcs1:__subpackages__", + "//external/rust/crates/pkcs8:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//packages/modules/Virtualization:__subpackages__", + "//system/keymint:__subpackages__", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 64e0e45..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" - }, - "force-rlib": true, - "suffix": "_nostd", - "alloc": true, - "no-std": true - } - ] -} diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp index f9ef72a..0a555ff 100644 --- a/cargo2android_viz.bp +++ b/cargo2android_viz.bp @@ -2,5 +2,6 @@ visibility: [ "//external/rust/crates/pkcs1:__subpackages__", "//external/rust/crates/pkcs8:__subpackages__", "//external/rust/crates/x509-cert:__subpackages__", + "//packages/modules/Virtualization:__subpackages__", "//system/keymint:__subpackages__", ] diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..4b2876a --- /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": { + "spki": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libder": "libder_nostd", + "libspki": "libspki_nostd" + }, + "package": { + "spki": { + "add_module_block": "cargo2android_viz.bp", + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |