cov-mark: Add a variant without the "enable" feature
cov-mark is used in our code base so unit tests can check that a
certain code path marked by `cov_mark::hit!` is actually called
(see docs in https://docs.rs/cov-mark/latest/cov_mark/).
The macro expands to atomic counters with the "enable" feature,
and nothing when not enabled.
I'd like disable it for production builds and only enable it
for tests hence providing two variants in the crate.
Bug: 377251092
Test: atest cov-mark_test_tests_smoke cov-mark_disabled_test_tests_smoke --host
Change-Id: I02349b5ccb61874732faf7ba8568d19200fca935
diff --git a/crates/cov-mark/.android-checksum.json b/crates/cov-mark/.android-checksum.json
index 1d865e0..97cde16 100644
--- a/crates/cov-mark/.android-checksum.json
+++ b/crates/cov-mark/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"9c6a3d18f8b4f110de64a2450da600ff35faef60775d89e68e559618c08dcde9","Android.bp":"9644235e817dfc8b938b4bfca52e4eb49f340376da238781a9242069d2bdb6c7","Cargo.toml":"fbca3e4496587084b9436587f7f5dc7806b35011f2a8bd75344add357bd42867","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"cb185d9310fd9b4d6ad5ba7c5b3964f554cb046af54a1f7857142ba2c615ded1","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"626ced7d42093fe39d9283900bee7b4a3b916b785d9a5c63e4ab575558f58e96","TEST_MAPPING":"b8d8f26864e467169a3a0396d4b0e04abea2549aa9b1617ca7500bde8151fd5f","cargo_embargo.json":"d87209d4c367ff47dd3b7c46cebe3557f0596daaaae987d18ea162cb31e92b6c","src/lib.rs":"0559d58bb9c4358a971a9e8434d6aad36c8b81a0f3759c0c5b7d91ba2dffff5e","tests/smoke.rs":"bb2da3619d815c5aa6d9116e870b3a7741b730183ceed295ed4a66b6c945d761"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"9c6a3d18f8b4f110de64a2450da600ff35faef60775d89e68e559618c08dcde9","Android.bp":"6adb0bc038139fb30e07c6b33946d73f23b7793b2467d11302c9a96f436c4d1d","Cargo.toml":"fbca3e4496587084b9436587f7f5dc7806b35011f2a8bd75344add357bd42867","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"38620a3cfaeec97a9197e8c39e436ea7f0bc86699b1f1c35f1aa41785b6d4eac","METADATA":"cb185d9310fd9b4d6ad5ba7c5b3964f554cb046af54a1f7857142ba2c615ded1","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"626ced7d42093fe39d9283900bee7b4a3b916b785d9a5c63e4ab575558f58e96","TEST_MAPPING":"1eaa62ccc0dd2d6cce86e389c8acc462e831f6bec461fd0f65488dfd8fb32479","cargo_embargo.json":"b613c802b205da2fb25a2185782b6254db468173a140ec61b16499e4522fa3ce","src/lib.rs":"0559d58bb9c4358a971a9e8434d6aad36c8b81a0f3759c0c5b7d91ba2dffff5e","tests/smoke.rs":"bb2da3619d815c5aa6d9116e870b3a7741b730183ceed295ed4a66b6c945d761"}}
\ No newline at end of file
diff --git a/crates/cov-mark/Android.bp b/crates/cov-mark/Android.bp
index afad5fa..53fc2cc 100644
--- a/crates/cov-mark/Android.bp
+++ b/crates/cov-mark/Android.bp
@@ -52,3 +52,35 @@
product_available: true,
vendor_available: true,
}
+
+rust_test {
+ name: "cov-mark_disabled_test_tests_smoke",
+ host_supported: true,
+ crate_name: "smoke",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.0.0",
+ crate_root: "tests/smoke.rs",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
+ edition: "2021",
+ rustlibs: ["libcov_mark_disabled"],
+}
+
+rust_library {
+ name: "libcov_mark_disabled",
+ host_supported: true,
+ crate_name: "cov_mark",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.0.0",
+ crate_root: "src/lib.rs",
+ edition: "2021",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ product_available: true,
+ vendor_available: true,
+}
diff --git a/crates/cov-mark/TEST_MAPPING b/crates/cov-mark/TEST_MAPPING
index c27cc41..9838dc7 100644
--- a/crates/cov-mark/TEST_MAPPING
+++ b/crates/cov-mark/TEST_MAPPING
@@ -1,6 +1,9 @@
{
"postsubmit": [
{
+ "name": "cov-mark_disabled_test_tests_smoke"
+ },
+ {
"name": "cov-mark_test_tests_smoke"
}
]
diff --git a/crates/cov-mark/cargo_embargo.json b/crates/cov-mark/cargo_embargo.json
index 9a0a579..0bc260a 100644
--- a/crates/cov-mark/cargo_embargo.json
+++ b/crates/cov-mark/cargo_embargo.json
@@ -1,3 +1,13 @@
{
- "tests": true
+ "tests": true,
+ "variants": [
+ {},
+ {
+ "features": [],
+ "module_name_overrides": {
+ "libcov_mark": "libcov_mark_disabled",
+ "cov-mark_test_tests_smoke": "cov-mark_disabled_test_tests_smoke"
+ }
+ }
+ ]
}
