diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-22 23:49:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-22 23:49:28 +0000 |
commit | 4fa0093d8f6e4d4f6d944375541b29a8d28ed06c (patch) | |
tree | 703d303ec5d63ecbfd61f067eb5fe950056119da | |
parent | 32c76cdac6e1bbc8b26a88e5d8d7d866ac6caca5 (diff) | |
parent | 00cc82d607daf111bdd640311d5d35b7348cebad (diff) | |
download | zeroize-4fa0093d8f6e4d4f6d944375541b29a8d28ed06c.tar.gz |
Migrate to cargo_embargo. am: ce949f372b am: 00cc82d607
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zeroize/+/2836656
Change-Id: I6f915cb9a609ef68dd342decd531c4f6205aaefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 82 | ||||
-rw-r--r-- | cargo2android.json | 19 | ||||
-rw-r--r-- | cargo_embargo.json | 25 |
3 files changed, 68 insertions, 58 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 { @@ -53,6 +53,48 @@ rust_library { min_sdk_version: "Tiramisu", } +rust_test { + name: "zeroize_test_tests_zeroize", + host_supported: true, + crate_name: "zeroize", + cargo_env_compat: true, + cargo_pkg_version: "1.6.0", + srcs: ["tests/zeroize.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2021", + features: [ + "alloc", + "zeroize_derive", + ], + rustlibs: ["libzeroize"], + proc_macros: ["libzeroize_derive"], +} + +rust_test { + name: "zeroize_test_tests_zeroize_derive", + host_supported: true, + crate_name: "zeroize_derive", + cargo_env_compat: true, + cargo_pkg_version: "1.6.0", + srcs: ["tests/zeroize_derive.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2021", + features: [ + "alloc", + "zeroize_derive", + ], + rustlibs: ["libzeroize"], + proc_macros: ["libzeroize_derive"], +} + rust_library_rlib { name: "libzeroize_nostd", crate_name: "zeroize", @@ -80,41 +122,3 @@ rust_library_rlib { vendor_available: true, min_sdk_version: "Tiramisu", } - -rust_defaults { - name: "zeroize_test_defaults", - crate_name: "zeroize", - cargo_env_compat: true, - cargo_pkg_version: "1.6.0", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2021", - features: [ - "alloc", - "zeroize_derive", - ], - rustlibs: [ - "libzeroize", - ], - proc_macros: ["libzeroize_derive"], -} - -rust_test { - name: "zeroize_test_tests_zeroize", - defaults: ["zeroize_test_defaults"], - host_supported: true, - srcs: ["tests/zeroize.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "zeroize_test_tests_zeroize_derive", - defaults: ["zeroize_test_defaults"], - host_supported: true, - srcs: ["tests/zeroize_derive.rs"], - test_options: { - unit_test: true, - }, -} diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 9ae6cab..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "device": true, - "run": true, - "min_sdk_version": "Tiramisu", - "vendor-available": true, - "features": "alloc,zeroize_derive", - "variants": [ - { - "tests": true - }, - { - "force-rlib": true, - "no-host": true, - "suffix": "_nostd", - "no-std": true, - "alloc": true - } - ] -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c610529 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,25 @@ +{ + "features": [ + "alloc", + "zeroize_derive" + ], + "min_sdk_version": "Tiramisu", + "variants": [ + { + "tests": true + }, + { + "module_name_overrides": { + "libzeroize": "libzeroize_nostd" + }, + "package": { + "zeroize": { + "alloc": true, + "force_rlib": true, + "host_supported": false, + "no_std": true + } + } + } + ] +} |