diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-10 21:14:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 21:14:46 +0000 |
| commit | d9bb241bfeaa2f992e54289750507578ea41da2e (patch) | |
| tree | ce1fc998e89a50ad7e7bb153fba468e303f01c01 | |
| parent | 60f00fc10000783bc0cb18f684dbaaf200ffa2ac (diff) | |
| parent | 0c2595665f4e9ea9b9619bfc30818e02bfaba38a (diff) | |
| download | flagset-d9bb241bfeaa2f992e54289750507578ea41da2e.tar.gz | |
Migrate to cargo_embargo. am: 0c2595665f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/flagset/+/2826473
Change-Id: I48eb5d3ee6571d7b295e673573c2a0d1a6091071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 20 | ||||
| -rw-r--r-- | cargo_embargo.json | 29 |
3 files changed, 35 insertions, 26 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 { @@ -47,9 +47,9 @@ rust_library_rlib { product_available: true, vendor_available: true, visibility: [ - "//external/rust/crates/der:__subpackages__", - "//external/rust/crates/x509-cert:__subpackages__", - "//system/keymint:__subpackages__", - ] - , + "//external/rust/crates/der:__subpackages__", + "//external/rust/crates/x509-cert:__subpackages__", + "//system/keymint:__subpackages__", + ], + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 973f0f9..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], - "run": true, - "vendor-available": true, - "variants": [ - { - }, - { - "device": true, - "no-host": true, - "add-module-block": "cargo2android_viz.bp", - "force-rlib": true, - "suffix": "_nostd", - "no-std": true - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..064a7af --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,29 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.virt" + ], + "run_cargo": false, + "variants": [ + { + "package": { + "flagset": { + "device_supported": false + } + } + }, + { + "module_name_overrides": { + "libflagset": "libflagset_nostd" + }, + "package": { + "flagset": { + "add_module_block": "cargo2android_viz.bp", + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |