From 25f18729d6145324bbca1b66ebb78af8cd14cb7a Mon Sep 17 00:00:00 2001 From: jj Date: Thu, 10 Apr 2025 21:38:23 +0000 Subject: [PATCH] lists: exclude licenses from domain substitution --- devutils/update_lists.py | 5 +++++ domain_substitution.list | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/devutils/update_lists.py b/devutils/update_lists.py index cfb98716..b0c08fa5 100755 --- a/devutils/update_lists.py +++ b/devutils/update_lists.py @@ -119,6 +119,8 @@ DOMAIN_EXCLUDE_PREFIXES = [ 'chrome/common/extensions/api/_api_features.json', 'extensions/common/extension_urls.cc', 'extensions/browser/updater/safe_manifest_parser.cc', + # License/credits stuff + 'tools/licenses/licenses.py', ] # pylint: enable=line-too-long @@ -249,6 +251,9 @@ def should_domain_substitute(path, relative_path, search_regex, used_dep_set, us if relative_path_posix.startswith(exclude_prefix): used_dep_set.add(exclude_prefix) return False + for license_path in ['license', 'license.txt', 'license.html']: + if relative_path_posix.endswith('/' + license_path): + return False return _check_regex_match(path, search_regex) return False diff --git a/domain_substitution.list b/domain_substitution.list index 1860100c..abdbc9f7 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -6722,7 +6722,6 @@ third_party/catapult/third_party/gsutil/third_party/httplib2/python2/httplib2/__ third_party/catapult/third_party/gsutil/third_party/httplib2/python3/httplib2/__init__.py third_party/catapult/third_party/gsutil/third_party/httplib2/tests/_TODO_legacy/python2/httplib2test_appengine.py third_party/catapult/third_party/gsutil/third_party/httplib2/tests/test_proxy.py -third_party/catapult/third_party/gsutil/third_party/pyasn1-modules/LICENSE.txt third_party/catapult/third_party/gsutil/third_party/pyasn1-modules/pyasn1_modules/pem.py third_party/catapult/third_party/gsutil/third_party/pyasn1-modules/pyasn1_modules/rfc1155.py third_party/catapult/third_party/gsutil/third_party/pyasn1-modules/pyasn1_modules/rfc1157.py @@ -6952,7 +6951,6 @@ third_party/catapult/third_party/polymer/components/webcomponentsjs/webcomponent third_party/catapult/third_party/polymer/components/webcomponentsjs/webcomponents.min.js third_party/catapult/third_party/polymer3/bower_components/polymer/test/unit/styling-cross-scope-apply.html third_party/catapult/third_party/polymer3/bower_components/polymer/test/unit/styling-scoped.html -third_party/catapult/third_party/pyasn1/LICENSE.txt third_party/catapult/third_party/pyasn1/pyasn1/codec/ber/decoder.py third_party/catapult/third_party/pyasn1/pyasn1/codec/ber/encoder.py third_party/catapult/third_party/pyasn1/pyasn1/codec/ber/eoo.py @@ -6981,7 +6979,6 @@ third_party/catapult/third_party/pyasn1/pyasn1/type/tag.py third_party/catapult/third_party/pyasn1/pyasn1/type/tagmap.py third_party/catapult/third_party/pyasn1/pyasn1/type/univ.py third_party/catapult/third_party/pyasn1/pyasn1/type/useful.py -third_party/catapult/third_party/pyasn1_modules/LICENSE.txt third_party/catapult/third_party/pyasn1_modules/pyasn1_modules/pem.py third_party/catapult/third_party/pyasn1_modules/pyasn1_modules/rfc1155.py third_party/catapult/third_party/pyasn1_modules/pyasn1_modules/rfc1157.py @@ -14089,7 +14086,6 @@ third_party/swiftshader/third_party/llvm-subzero/include/llvm/Support/CommandLin third_party/swiftshader/third_party/llvm-subzero/include/llvm/Support/Compiler.h third_party/swiftshader/third_party/marl/include/marl/trace.h third_party/swiftshader/third_party/marl/src/trace.cpp -third_party/swiftshader/third_party/subzero/LICENSE.TXT third_party/swiftshader/third_party/subzero/Makefile third_party/swiftshader/third_party/subzero/bloat/webtreemap.js third_party/swiftshader/third_party/subzero/pnacl-llvm/README.txt @@ -14859,7 +14855,6 @@ tools/json_schema_compiler/preview.py tools/json_schema_compiler/test/tabs.json tools/json_schema_compiler/test/windows.json tools/json_to_struct/PRESUBMIT.py -tools/licenses/licenses.py tools/licenses/licenses_test.py tools/linux/PRESUBMIT.py tools/mac/download_symbols.py @@ -15607,7 +15602,6 @@ url/gurl_unittest.cc url/ipc/url_param_traits_unittest.cc url/mojom/url_gurl_mojom_traits_unittest.cc url/origin_unittest.cc -url/third_party/mozilla/LICENSE.txt url/third_party/mozilla/url_parse.cc url/third_party/mozilla/url_parse.h url/url_canon_relative.cc