diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 18:00:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 18:00:14 +0000 |
| commit | b75cd1b649a6527c795bdd5c94bba00e4c06ed59 (patch) | |
| tree | dcf49c63bc48a68ae6fec584bf70bbf5ccf2481d | |
| parent | f20bd54655d824218e6b5b5d2b6326eca1f58c00 (diff) | |
| parent | 50f94159313ed1bbff88d0b2c4452566bdb41d11 (diff) | |
| download | zeroize-b75cd1b649a6527c795bdd5c94bba00e4c06ed59.tar.gz | |
Use new no-std flag to cargo2android. am: 5b6cea4867 am: f305e2f931 am: 50f9415931
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zeroize/+/2584689
Change-Id: I702b3b1027b3b0c5801599406e463a63e9ae1457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 49 | ||||
| -rw-r--r-- | cargo2android.json | 21 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 20 |
3 files changed, 38 insertions, 52 deletions
@@ -46,8 +46,31 @@ rust_library { proc_macros: ["libzeroize_derive"], apex_available: [ "//apex_available:platform", - "com.android.uwb", - "com.android.virt", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, + min_sdk_version: "Tiramisu", +} + +rust_library_rlib { + name: "libzeroize_nostd", + crate_name: "zeroize", + cargo_env_compat: true, + cargo_pkg_version: "1.6.0", + srcs: ["src/lib.rs"], + edition: "2021", + features: ["zeroize_derive"], + proc_macros: ["libzeroize_derive"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", ], product_available: true, vendor_available: true, @@ -91,25 +114,3 @@ rust_test { unit_test: true, }, } - -rust_library_rlib { - name: "libzeroize_nostd", - crate_name: "zeroize", - cargo_env_compat: true, - cargo_pkg_version: "1.5.7", - srcs: ["src/lib.rs"], - edition: "2018", - proc_macros: ["libzeroize_derive"], - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - features: [ - "zeroize_derive", - ], - vendor_available: true, - min_sdk_version: "Tiramisu", -} - diff --git a/cargo2android.json b/cargo2android.json index d05dd9f..b6a9107 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,14 +1,19 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", - "apex-available": [ - "//apex_available:platform", - "com.android.uwb", - "com.android.virt" - ], "device": true, "run": true, "min_sdk_version": "Tiramisu", "vendor-available": true, - "tests": true, - "features": "alloc,zeroize_derive" + "variants": [ + { + "features": "alloc,zeroize_derive", + "tests": true + }, + { + "features": "zeroize_derive", + "force-rlib": true, + "no-host": true, + "suffix": "_nostd", + "no-std": true + } + ] } diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp deleted file mode 100644 index d7f5eb2..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,20 +0,0 @@ -rust_library_rlib { - name: "libzeroize_nostd", - crate_name: "zeroize", - cargo_env_compat: true, - cargo_pkg_version: "1.5.7", - srcs: ["src/lib.rs"], - edition: "2018", - proc_macros: ["libzeroize_derive"], - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - features: [ - "zeroize_derive", - ], - vendor_available: true, - min_sdk_version: "Tiramisu", -} |