commit 2d971bb07e4c015d5f77106dd0ba64751c8d0212
author James Farrell <jamesfarrell@google.com> Mon Oct 21 16:15:47 2024 +0000
committer James Farrell <jamesfarrell@google.com> Mon Oct 21 20:05:29 2024 +0000
tree cc608aa7e037b5d092510251c7b3316fbfa48de6
parent 31b7ed3a4728a5cef575e4166f866eeef841838f

Allow license build rule name to be overridden.

We need this in order to use cargo_embargo in crates with multiple
versions (or we need to have an Android.bp patch for the deprecated version of every crate).

Not sure this is the best way to do it, but it works.

Bug: http://b/339424309
Test: treehugger
Change-Id: I624792c9fd7eb31622952a98aa6b4130a4356a30

tools/cargo_embargo/src/main.rs

diff --git a/tools/cargo_embargo/src/main.rs b/tools/cargo_embargo/src/main.rs
index 1a42c7b..87f3dcd 100644
--- a/tools/cargo_embargo/src/main.rs
+++ b/tools/cargo_embargo/src/main.rs
@@ -667,6 +667,7 @@
             package_cfg,
             read_license_header(&output_path)?.trim(),
             crates,
+            &cfg.variants.first().unwrap().module_name_overrides,
         )?;
         let bp_contents = package_header + &bp_contents;
         write_format_android_bp(&output_path, &bp_contents, package_cfg.patch.as_deref())?;
@@ -694,6 +695,7 @@
     package_cfg: &PackageConfig,
     license_header: &str,
     crates: &[Vec<Crate>],
+    module_name_overrides: &BTreeMap<String, String>,
 ) -> Result<String> {
     let crates = crates.iter().flatten().collect::<Vec<_>>();
     if let Some(first) = crates.first() {
@@ -702,7 +704,17 @@
                 let mut modules = Vec::new();
                 let license = choose_license(license)?;
 
-                let license_name = format!("external_rust_crates_{}_license", package_name);
+                let default_license_name = format!("external_rust_crates_{}_license", package_name);
+
+                let license_name = match override_module_name(
+                    &default_license_name,
+                    &[],
+                    module_name_overrides,
+                    &RENAME_MAP,
+                ) {
+                    Some(x) => x,
+                    None => default_license_name,
+                };
 
                 let mut package_module = BpModule::new("package".to_string());
                 package_module.props.set("default_team", "trendy_team_android_rust");
@@ -1394,8 +1406,14 @@
             let package_name = &crates[0][0].package_name;
             let def = PackageConfig::default();
             let package_cfg = cfg.package.get(package_name).unwrap_or(&def);
-            let mut output =
-                generate_android_bp_package_header(package_name, package_cfg, "", &crates).unwrap();
+            let mut output = generate_android_bp_package_header(
+                package_name,
+                package_cfg,
+                "",
+                &crates,
+                &cfg.variants.first().unwrap().module_name_overrides,
+            )
+            .unwrap();
             for (variant_index, variant_cfg) in cfg.variants.iter().enumerate() {
                 let variant_crates = &crates[variant_index];
                 let package_name = &variant_crates[0].package_name;