Merge "Convert cargo2android test-blocklist to module-blocklist." into main am: dd6ca4d751tmp_amf_298295554

Original change: https://android-review.googlesource.com/c/platform/development/+/2772386

Change-Id: If544316119a89cdf66e0a20d4b66135cc1e8b4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/tools/cargo_embargo/src/config/legacy.rs b/tools/cargo_embargo/src/config/legacy.rs
index 415d20215..1665f42c3 100644
--- a/tools/cargo_embargo/src/config/legacy.rs
+++ b/tools/cargo_embargo/src/config/legacy.rs
@@ -47,6 +47,8 @@ pub struct Config {
     #[serde(default)]
     run: bool,
     #[serde(default)]
+    test_blocklist: Vec<String>,
+    #[serde(default)]
     test_data: Vec<String>,
     #[serde(default)]
     tests: bool,
@@ -78,6 +80,11 @@ impl Config {
             .iter()
             .map(|package_name| package_to_library_name(package_name))
             .collect();
+        let module_blocklist = self
+            .test_blocklist
+            .iter()
+            .map(|test_filename| test_filename_to_module_name(package_name, test_filename))
+            .collect();
         let package_config = PackageConfig {
             device_supported: self.device,
             host_supported: !self.no_host,
@@ -104,6 +111,7 @@ impl Config {
             product_available: self.product_available,
             vendor_available: self.vendor_available,
             min_sdk_version: self.min_sdk_version.clone(),
+            module_blocklist,
             package,
             run_cargo,
             ..Default::default()
@@ -116,3 +124,7 @@ fn package_to_library_name(package_name: &str) -> String {
     let module_name = format!("lib{}", package_name);
     renamed_module(&module_name).to_owned()
 }
+
+fn test_filename_to_module_name(package_name: &str, test_filename: &str) -> String {
+    format!("{}_test_{}", package_name, test_filename.replace('/', "_").replace(".rs", ""))
+}