From 585c8fbe90b957e0d723ddcbbeb38ae30d9b9e98 Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Tue, 16 Apr 2024 17:14:10 +0200 Subject: Enable tests that depend on bincode The bincode crate was imported in b/330683225, so we can now enable unit tests for crates which uses it as a dev-dependency. Bug: 333560480 Test: atest --host 'uuid_test_*' Change-Id: I739081094847101478aad30a1556b428850f9cbc --- Android.bp | 39 ++++++++++++++++++++++++++++++++++++++- cargo_embargo.json | 6 ++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index eb86c7e..f4f2c9b 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,7 @@ // This file is generated by cargo_embargo. -// Do not modify this file as changes will be overridden on upgrade. +// Do not modify this file after the first "rust_*" or "genrule" module +// because the changes will be overridden on upgrade. +// Content before the first "rust_*" or "genrule" module is preserved. package { default_applicable_licenses: ["external_rust_crates_uuid_license"], @@ -66,6 +68,41 @@ rust_library { vendor_available: true, } +rust_test { + name: "uuid_test_src_lib", + host_supported: true, + crate_name: "uuid", + cargo_env_compat: true, + cargo_pkg_version: "1.7.0", + srcs: ["src/lib.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, + test_options: { + unit_test: true, + }, + edition: "2018", + features: [ + "atomic", + "rng", + "serde", + "std", + "v1", + "v4", + ], + rustlibs: [ + "libatomic_rust", + "libbincode", + "libgetrandom", + "libserde", + "libserde_json", + "libserde_test", + ], + proc_macros: [ + "librustversion", + "libserde_derive", + ], +} + rust_library_rlib { name: "libuuid_nostd", crate_name: "uuid", diff --git a/cargo_embargo.json b/cargo_embargo.json index 2736f99..bb60a33 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -1,7 +1,13 @@ { "run_cargo": false, + "package": { + "uuid": { + "dep_blocklist": ["libtrybuild"] + } + }, "variants": [ { + "tests": true, "features": [ "serde", "std", -- cgit v1.2.3