[codehealth] Fix licenses.py presubmit failures This commit addresses the presubmit failures caused by the recent transition to Chromium's upstream `licenses.py` script. - Renamed `README.openscreen` files to `README.chromium` in `third_party/getopt`, `third_party/libc++`, and `third_party/libc++abi` as the upstream script only looks for `README.chromium`. - Removed duplicate `README.openscreen` from `third_party/ninja`. - Added `third_party/googletest/README.chromium` to store metadata that was previously hardcoded in the old `licenses.py` script's `SPECIAL_CASES` dictionary. - Updated `licenses.PRUNE_PATHS` in `PRESUBMIT.py` to ignore nested `third_party` directories within our dependencies (e.g. `boringssl`, `googleurl`, `perfetto`, etc.) since the upstream script now recursively checks subdirectories. Change-Id: I8322ca0557688f84ffbc9bbbc9598edf6defb2f1 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/7833399 Reviewed-by: Mark Foltz <mfoltz@chromium.org> Commit-Queue: Jordan Bayles <jophba@chromium.org> Commit-Queue: Mark Foltz <mfoltz@chromium.org>
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 380bf33..231414c 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py
@@ -47,15 +47,23 @@ def _check_licenses(input_api, output_api): """Checks third party licenses and returns a list of violations.""" # NOTE: the licenses check is confused by the fact that we don't actually - # check ou the libraries in buildtools/third_party, so explicitly exclude + # check out the libraries in buildtools/third_party, so explicitly exclude # that folder. See https://crbug.com/1215335 for more info. licenses.PRUNE_PATHS.update([ os.path.join('buildtools', 'third_party'), os.path.join('third_party', 'libc++'), os.path.join('third_party', 'libc++abi'), os.path.join('third_party', 'rust-toolchain'), - os.path.join('third_party', 'depot_tools') - ]) + os.path.join('third_party', 'depot_tools'), + os.path.join('third_party', 'boringssl', 'src', 'third_party'), + os.path.join('third_party', 'googleurl', 'src', 'polyfills', + 'third_party'), + os.path.join('third_party', 'instrumented_libs', 'binaries'), + os.path.join('third_party', 'perfetto', 'src', 'protos', + 'third_party'), + os.path.join('third_party', 'protobuf', 'third_party'), + os.path.join('third_party', 'valijson', 'src', 'thirdparty'), + ]) if any(s.LocalPath().startswith('third_party') for s in input_api.change.AffectedFiles()):
diff --git a/third_party/getopt/README.openscreen b/third_party/getopt/README.chromium similarity index 96% rename from third_party/getopt/README.openscreen rename to third_party/getopt/README.chromium index 077a948..c9dd627 100644 --- a/third_party/getopt/README.openscreen +++ b/third_party/getopt/README.chromium
@@ -1,7 +1,7 @@ Name: Gregory Pietsch getopt Short Name: getopt URL: https://sourceware.org/ml/newlib/2005/msg00758.html -License: Public domain +License: getopt License File: LICENSE Version: 1.0 Security Critical: no
diff --git a/third_party/googletest/README.chromium b/third_party/googletest/README.chromium new file mode 100644 index 0000000..81db16f --- /dev/null +++ b/third_party/googletest/README.chromium
@@ -0,0 +1,5 @@ +Name: googletest +URL: https://github.com/google/googletest +License: BSD-3-Clause +License File: src/LICENSE +Shipped: no
diff --git a/third_party/libc++/README.openscreen b/third_party/libc++/README.chromium similarity index 74% rename from third_party/libc++/README.openscreen rename to third_party/libc++/README.chromium index 43ae47e..85c7eea 100644 --- a/third_party/libc++/README.openscreen +++ b/third_party/libc++/README.chromium
@@ -2,7 +2,7 @@ Short Name: libc++ URL: http://libcxx.llvm.org/ Version: 1.0 -License: MIT, University of Illinois/NCSA Open Source License +License: NCSA, Apache-with-LLVM-Exception, MIT License File: src/LICENSE.TXT Security Critical: yes Shipped: yes
diff --git a/third_party/libc++abi/README.openscreen b/third_party/libc++abi/README.chromium similarity index 75% rename from third_party/libc++abi/README.openscreen rename to third_party/libc++abi/README.chromium index 7540c8c..e6eea11 100644 --- a/third_party/libc++abi/README.openscreen +++ b/third_party/libc++abi/README.chromium
@@ -2,7 +2,7 @@ Short Name: libc++abi URL: http://libcxxabi.llvm.org/ Version: 1.0 -License: MIT, University of Illinois/NCSA Open Source License +License: NCSA, Apache-with-LLVM-Exception, MIT License File: src/LICENSE.TXT Security Critical: yes Shipped: yes
diff --git a/third_party/ninja/README.openscreen b/third_party/ninja/README.openscreen deleted file mode 100644 index d712b3e..0000000 --- a/third_party/ninja/README.openscreen +++ /dev/null
@@ -1,18 +0,0 @@ -Name: ninja -Short Name: ninja -URL: https://github.com/ninja-build/ninja -Revision: See the CIPD version in DEPS -License: Apache License 2.0 -License File: COPYING -Security Critical: no -Shipped: no - -Description: -Ninja is a small build system with a focus on speed, and is used to build -this project. - -The CIPD packages are built using the 3pp pipeline. -https://chromium.googlesource.com/infra/infra/+/refs/heads/main/3pp/ninja/ - -Local Modifications: -None