Merge "cargo_embargo: additional license selection" into main

aosp-mirror · Oct 1, 2024 · 5dc8d68 · 5dc8d68
2 parents 3834e4e + c4d055d
commit 5dc8d68
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/tools/cargo_embargo/src/main.rs b/tools/cargo_embargo/src/main.rs
@@ -752,6 +752,7 @@ fn choose_license(license: &str) -> &str {
 
         // Variations on "BSD-* OR Apache-2.0"
         "Apache-2.0 OR BSD-3-Clause" => "Apache-2.0",
+        "Apache-2.0 or BSD-3-Clause" => "Apache-2.0",
         "BSD-3-Clause OR Apache-2.0" => "Apache-2.0",
 
         // Variations on "BSD-* OR MIT OR Apache-2.0"