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

Merge "Map cargo2android.json dep-suffixes to module_name_overrides." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-06 15:40:44 +00:00
committed by Gerrit Code Review
parent ef56cb16ac d91152b7ec
commit a2d41d454c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/cargo_embargo/src/config/legacy.rs
View File

@@ -29,6 +29,8 @@ pub struct Config {
apex_available: Vec<String>, apex_available: Vec<String>,
#[serde(default)] #[serde(default)]
cfg_blocklist: Vec<String>, cfg_blocklist: Vec<String>,
#[serde(default)]
dep_suffixes: BTreeMap<String, String>,
#[allow(unused)] // Deprecated option. #[allow(unused)] // Deprecated option.
#[serde(default)] #[serde(default)]
dependencies: bool, dependencies: bool,
@@ -89,6 +91,15 @@ impl Config {
.iter() .iter()
.map(|test_filename| test_filename_to_module_name(package_name, test_filename)) .map(|test_filename| test_filename_to_module_name(package_name, test_filename))
.collect(); .collect();
let module_name_overrides = self
.dep_suffixes
.iter()
.map(|(dependency, suffix)| {
let module_name = package_to_library_name(dependency);
let with_suffix = format!("{}{}", module_name, suffix);
(module_name, with_suffix)
})
.collect();
let package_config = PackageConfig { let package_config = PackageConfig {
device_supported: self.device, device_supported: self.device,
force_rlib: self.force_rlib, force_rlib: self.force_rlib,
@@ -118,6 +129,7 @@ impl Config {
vendor_available: self.vendor_available, vendor_available: self.vendor_available,
min_sdk_version: self.min_sdk_version.clone(), min_sdk_version: self.min_sdk_version.clone(),
module_blocklist, module_blocklist,
module_name_overrides,
package, package,
run_cargo, run_cargo,
..Default::default() ..Default::default()