diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-13 16:20:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-13 16:20:08 +0000 |
| commit | 28a349948744486a975733437109765c6b1a78dd (patch) | |
| tree | 44798004a71301b69be09409cb3756a90d00f32f | |
| parent | 7ca1ab530a8836084bf69b09ed6875ebb803b9b0 (diff) | |
| parent | f86cba286e0b91de321ed7ae64349a451f69c55f (diff) | |
| download | development-28a349948744486a975733437109765c6b1a78dd.tar.gz | |
Merge "Don't add extra_cfg twice." into main
| -rw-r--r-- | tools/cargo_embargo/src/cargo/metadata.rs | 5 | ||||
| -rw-r--r-- | tools/cargo_embargo/src/main.rs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/cargo_embargo/src/cargo/metadata.rs b/tools/cargo_embargo/src/cargo/metadata.rs index 2958a0117..5f146f02f 100644 --- a/tools/cargo_embargo/src/cargo/metadata.rs +++ b/tools/cargo_embargo/src/cargo/metadata.rs @@ -103,12 +103,13 @@ pub enum TargetKind { pub fn parse_cargo_metadata_str(cargo_metadata: &str, cfg: &VariantConfig) -> Result<Vec<Crate>> { let metadata = serde_json::from_str(cargo_metadata).context("failed to parse cargo metadata")?; - parse_cargo_metadata(&metadata, &cfg.features, cfg.tests) + parse_cargo_metadata(&metadata, &cfg.features, &cfg.extra_cfg, cfg.tests) } fn parse_cargo_metadata( metadata: &WorkspaceMetadata, features: &Option<Vec<String>>, + cfgs: &[String], include_tests: bool, ) -> Result<Vec<Crate>> { let mut crates = Vec::new(); @@ -174,6 +175,7 @@ fn parse_cargo_metadata( &target_kinds, false, )?, + cfgs: cfgs.to_owned(), ..Default::default() }); } @@ -196,6 +198,7 @@ fn parse_cargo_metadata( &target_kinds, true, )?, + cfgs: cfgs.to_owned(), ..Default::default() }); } diff --git a/tools/cargo_embargo/src/main.rs b/tools/cargo_embargo/src/main.rs index 2f9ea44c2..425d19a69 100644 --- a/tools/cargo_embargo/src/main.rs +++ b/tools/cargo_embargo/src/main.rs @@ -929,7 +929,6 @@ fn crate_to_bp_modules( .clone() .into_iter() .filter(|crate_cfg| !cfg.cfg_blocklist.contains(crate_cfg)) - .chain(cfg.extra_cfg.clone().into_iter()) .collect(), ); @@ -1109,7 +1108,6 @@ fn crate_to_rulesmk( .cfgs .iter() .filter(|crate_cfg| !cfg.cfg_blocklist.contains(crate_cfg)) - .chain(cfg.extra_cfg.iter()) .map(|cfg| format!("--cfg '{cfg}'")), ); if !flags.is_empty() { |