Merge "License validation tweaks for webpki." into main

aosp-mirror · Jan 29, 2025 · 737fedb · 737fedb
2 parents a3c5e11 + 824a6b4
commit 737fedb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tools/external_crates/license_checker/src/license_file_finder.rs b/tools/external_crates/license_checker/src/license_file_finder.rs
@@ -31,6 +31,7 @@ static LICENSE_GLOBS: &[&str] = &[
     "COPYING",
     "license",
     "license.*",
+    "third-party/chromium/LICENSE",
 ];
 
 pub(crate) fn find_license_files(

diff --git a/tools/external_crates/license_checker/src/licenses/ISC.txt b/tools/external_crates/license_checker/src/licenses/ISC.txt
@@ -1,10 +1,10 @@
-Permission to use, copy, modify, and /or distribute this software for
+Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the
 above copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
 ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF