aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Yu Huang <akahuang@google.com>2022-10-26 03:14:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-26 03:14:50 +0000
commitfd264198c626c2551fc346f10ce87e0b44cd07ed (patch)
treee56364b12f92a6e882122fb5f805a04ec4416ca2
parent160e28e03ab2090c77e4c9d9fe845590955ed49b (diff)
parent62dc10057b5ed156edf5edac4528ece19d05cf78 (diff)
downloadzeroize-fd264198c626c2551fc346f10ce87e0b44cd07ed.tar.gz
Enable tests am: 16cc42d73a am: 39d5314d84 am: 62dc10057b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zeroize/+/2267470 Change-Id: I5b72ed47c0cc2545b0cf25009671a145f2e2c7d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp38
-rw-r--r--cargo2android.json1
2 files changed, 39 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 0d41597..c0c8306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,3 +52,41 @@ rust_library {
vendor_available: true,
min_sdk_version: "Tiramisu",
}
+
+rust_defaults {
+ name: "zeroize_test_defaults",
+ crate_name: "zeroize",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.5.7",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ 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
index b95fbe7..29e5445 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,5 +8,6 @@
"run": true,
"min_sdk_version": "Tiramisu",
"vendor-available": true,
+ "tests": true,
"features": "alloc,zeroize_derive"
}