LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "cargo_embargo: add option to set module visibility"

Browse Source
This commit is contained in:
Frederick Mayle
2023-02-16 19:26:27 +00:00
committed by Gerrit Code Review
parent 05c9290c30 5b2ed7a0f5
commit 97f5616689
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/cargo_embargo/src/bp.rs
View File

@@ -118,6 +118,7 @@ impl BpProperties {
"target", "target",
"ld_flags", "ld_flags",
"apex_available", "apex_available",
"visibility",
]; ];
let mut props: Vec<(&String, &BpValue)> = self.map.iter().collect(); let mut props: Vec<(&String, &BpValue)> = self.map.iter().collect();
props.sort_by_key(|(k, _)| { props.sort_by_key(|(k, _)| {

7
tools/cargo_embargo/src/main.rs
View File

@@ -103,6 +103,9 @@ struct Config {
/// Modules in this list will not be generated. /// Modules in this list will not be generated.
#[serde(default)] #[serde(default)]
module_blocklist: Vec<String>, module_blocklist: Vec<String>,
/// Modules name => Soong "visibility" property.
#[serde(default)]
module_visibility: BTreeMap<String, Vec<String>>,
} }
/// Options that apply to everything in a package (i.e. everything associated with a particular /// Options that apply to everything in a package (i.e. everything associated with a particular
@@ -569,6 +572,10 @@ fn crate_to_bp_modules(
m.props.set("apex_available", cfg.apex_available.clone()); m.props.set("apex_available", cfg.apex_available.clone());
} }
if let Some(visibility) = cfg.module_visibility.get(module_name) {
m.props.set("visibility", visibility.clone());
}
if let Some(path) = &package_cfg.add_module_block { if let Some(path) = &package_cfg.add_module_block {
let content = std::fs::read_to_string(path) let content = std::fs::read_to_string(path)
.with_context(|| format!("failed to read {path:?}"))?; .with_context(|| format!("failed to read {path:?}"))?;