diff --git a/DEPS b/DEPS index 8925b43f58..6440f6e027 100644 --- a/DEPS +++ b/DEPS @@ -664,7 +664,7 @@ deps = { 'src/flutter/third_party/wuffs': Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61', - 'src/third_party/zlib': + 'src/flutter/third_party/zlib': Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df', 'src/flutter/third_party/cpu_features/src': diff --git a/engine/src/flutter/build/secondary/third_party/zlib/BUILD.gn b/engine/src/flutter/build/secondary/third_party/zlib/BUILD.gn new file mode 100644 index 0000000000..2bbc071d6e --- /dev/null +++ b/engine/src/flutter/build/secondary/third_party/zlib/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +group("zlib") { + public_deps = [ "//flutter/third_party/zlib" ] + + # Add the third_party root directory to the include path to support Dart + # sources that include zlib headers using "zlib/zlib.h" + public_configs = [ ":include_third_party" ] +} + +config("zlib_config") { + configs = [ "//flutter/third_party/zlib:zlib_config" ] +} + +config("include_third_party") { + include_dirs = [ "//flutter/third_party" ] +} diff --git a/engine/src/flutter/build/secondary/third_party/zlib/google/BUILD.gn b/engine/src/flutter/build/secondary/third_party/zlib/google/BUILD.gn new file mode 100644 index 0000000000..9e3f034887 --- /dev/null +++ b/engine/src/flutter/build/secondary/third_party/zlib/google/BUILD.gn @@ -0,0 +1,12 @@ +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +config("compression_utils_config") { + include_dirs = [ "//flutter/third_party/zlib/google" ] +} + +group("compression_utils_portable") { + public_deps = [ "//flutter/third_party/zlib/google:compression_utils_portable" ] + public_configs = [ ":compression_utils_config" ] +} diff --git a/engine/src/flutter/ci/licenses.sh b/engine/src/flutter/ci/licenses.sh index b1dc4ce511..535779d604 100755 --- a/engine/src/flutter/ci/licenses.sh +++ b/engine/src/flutter/ci/licenses.sh @@ -174,7 +174,7 @@ function verify_licenses() ( local actualLicenseCount actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')" - local expectedLicenseCount=890 # When changing this number: Update the error message below as well describing the newly expected license types. + local expectedLicenseCount=899 # When changing this number: Update the error message below as well describing the newly expected license types. if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then echo "=============================== ERROR ===============================" diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 2a674fe846..e263155d90 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -3113,6 +3113,27 @@ ../../../flutter/third_party/wuffs/script ../../../flutter/third_party/wuffs/sync.txt ../../../flutter/third_party/yapf +../../../flutter/third_party/zlib/.git +../../../flutter/third_party/zlib/CMakeLists.txt +../../../flutter/third_party/zlib/DIR_METADATA +../../../flutter/third_party/zlib/OWNERS +../../../flutter/third_party/zlib/README.chromium +../../../flutter/third_party/zlib/contrib/minizip/Makefile +../../../flutter/third_party/zlib/contrib/minizip/README.chromium +../../../flutter/third_party/zlib/contrib/minizip/miniunz.c +../../../flutter/third_party/zlib/contrib/minizip/minizip.c +../../../flutter/third_party/zlib/contrib/minizip/minizip.md +../../../flutter/third_party/zlib/contrib/tests +../../../flutter/third_party/zlib/examples +../../../flutter/third_party/zlib/google/DEPS +../../../flutter/third_party/zlib/google/OWNERS +../../../flutter/third_party/zlib/google/compression_utils_unittest.cc +../../../flutter/third_party/zlib/google/test +../../../flutter/third_party/zlib/google/zip_reader_unittest.cc +../../../flutter/third_party/zlib/google/zip_unittest.cc +../../../flutter/third_party/zlib/patches/README +../../../flutter/third_party/zlib/test +../../../flutter/third_party/zlib/zlib.3 ../../../flutter/tools ../../../flutter/tools/licenses/.dart_tool ../../../flutter/tools/licenses/.gitignore @@ -3527,25 +3548,4 @@ ../../../third_party/libcxxabi/test ../../../third_party/libcxxabi/www ../../../third_party/web_dependencies/canvaskit -../../../third_party/zlib/.git -../../../third_party/zlib/CMakeLists.txt -../../../third_party/zlib/DIR_METADATA -../../../third_party/zlib/OWNERS -../../../third_party/zlib/README.chromium -../../../third_party/zlib/contrib/minizip/Makefile -../../../third_party/zlib/contrib/minizip/README.chromium -../../../third_party/zlib/contrib/minizip/miniunz.c -../../../third_party/zlib/contrib/minizip/minizip.c -../../../third_party/zlib/contrib/minizip/minizip.md -../../../third_party/zlib/contrib/tests -../../../third_party/zlib/examples -../../../third_party/zlib/google/DEPS -../../../third_party/zlib/google/OWNERS -../../../third_party/zlib/google/compression_utils_unittest.cc -../../../third_party/zlib/google/test -../../../third_party/zlib/google/zip_reader_unittest.cc -../../../third_party/zlib/google/zip_unittest.cc -../../../third_party/zlib/patches/README -../../../third_party/zlib/test -../../../third_party/zlib/zlib.3 ../../../tools diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 7a1b8d0b0f..3ce697690a 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -4739,7 +4739,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/f470eaaf6e6d925ded8f9b16e8a662d00c144929 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/38c43a01a51ed8351761da3de87fcfb55485b209 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index ad7bbd9116..a228e44804 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -10257,6 +10257,59 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/zlib.h +TYPE: LicenseType.zlib +FILE: ../../../flutter/third_party/zlib/adler32.c +FILE: ../../../flutter/third_party/zlib/compress.c +FILE: ../../../flutter/third_party/zlib/contrib/optimizations/inffast_chunk.c +FILE: ../../../flutter/third_party/zlib/contrib/optimizations/inffast_chunk.h +FILE: ../../../flutter/third_party/zlib/contrib/optimizations/inflate.c +FILE: ../../../flutter/third_party/zlib/crc32.c +FILE: ../../../flutter/third_party/zlib/crc_folding.c +FILE: ../../../flutter/third_party/zlib/deflate.c +FILE: ../../../flutter/third_party/zlib/deflate.h +FILE: ../../../flutter/third_party/zlib/gzclose.c +FILE: ../../../flutter/third_party/zlib/gzguts.h +FILE: ../../../flutter/third_party/zlib/gzlib.c +FILE: ../../../flutter/third_party/zlib/gzread.c +FILE: ../../../flutter/third_party/zlib/gzwrite.c +FILE: ../../../flutter/third_party/zlib/infback.c +FILE: ../../../flutter/third_party/zlib/inffast.c +FILE: ../../../flutter/third_party/zlib/inffast.h +FILE: ../../../flutter/third_party/zlib/inflate.c +FILE: ../../../flutter/third_party/zlib/inflate.h +FILE: ../../../flutter/third_party/zlib/inftrees.c +FILE: ../../../flutter/third_party/zlib/inftrees.h +FILE: ../../../flutter/third_party/zlib/trees.c +FILE: ../../../flutter/third_party/zlib/uncompr.c +FILE: ../../../flutter/third_party/zlib/zconf.h +FILE: ../../../flutter/third_party/zlib/zconf.h.cmakein +FILE: ../../../flutter/third_party/zlib/zconf.h.in +FILE: ../../../flutter/third_party/zlib/zlib.h +FILE: ../../../flutter/third_party/zlib/zutil.c +FILE: ../../../flutter/third_party/zlib/zutil.h +---------------------------------------------------------------------------------------------------- +Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: icu ORIGIN: ../../../flutter/third_party/icu/source/i18n/astro.h + ../../../flutter/third_party/icu/LICENSE @@ -12143,6 +12196,15 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/contrib/minizip/crypt.h +TYPE: LicenseType.unknown +FILE: ../../../flutter/third_party/zlib/contrib/minizip/crypt.h +---------------------------------------------------------------------------------------------------- +Copyright (C) 1998-2005 Gilles Vollant +==================================================================================================== + ==================================================================================================== LIBRARY: icu ORIGIN: ../../../flutter/third_party/icu/source/common/unicode/schriter.h + ../../../flutter/third_party/icu/LICENSE @@ -27881,6 +27943,42 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/contrib/optimizations/chunkcopy.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/zlib/contrib/optimizations/chunkcopy.h +---------------------------------------------------------------------------------------------------- +Copyright (C) 2017 ARM, Inc. +Copyright 2017 The Chromium Authors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: glslang ORIGIN: ../../../flutter/third_party/vulkan-deps/glslang/src/glslang/MachineIndependent/attribute.h @@ -47537,6 +47635,47 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/adler32_simd.c + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/adler32_simd.h + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/crc32_simd.c + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/crc32_simd.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/zlib/adler32_simd.c +FILE: ../../../flutter/third_party/zlib/adler32_simd.h +FILE: ../../../flutter/third_party/zlib/crc32_simd.c +FILE: ../../../flutter/third_party/zlib/crc32_simd.h +---------------------------------------------------------------------------------------------------- +Copyright 2017 The Chromium Authors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: boringssl ORIGIN: ../../../flutter/third_party/boringssl/src/pki/common_cert_errors.cc (with ../../../flutter/third_party/boringssl/src/LICENSE) @@ -48568,6 +48707,45 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/contrib/bench/zlib_bench.cc + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/cpu_features.c + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/cpu_features.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/zlib/contrib/bench/zlib_bench.cc +FILE: ../../../flutter/third_party/zlib/cpu_features.c +FILE: ../../../flutter/third_party/zlib/cpu_features.h +---------------------------------------------------------------------------------------------------- +Copyright 2018 The Chromium Authors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: accessibility LIBRARY: angle @@ -49097,6 +49275,45 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/contrib/optimizations/insert_string.h + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/google/compression_utils_portable.cc + ../../../LICENSE +ORIGIN: ../../../flutter/third_party/zlib/google/compression_utils_portable.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/zlib/contrib/optimizations/insert_string.h +FILE: ../../../flutter/third_party/zlib/google/compression_utils_portable.cc +FILE: ../../../flutter/third_party/zlib/google/compression_utils_portable.h +---------------------------------------------------------------------------------------------------- +Copyright 2019 The Chromium Authors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: boringssl ORIGIN: ../../../flutter/third_party/boringssl/src/pki/crl.cc (with ../../../flutter/third_party/boringssl/src/LICENSE) @@ -50684,6 +50901,41 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/slide_hash_simd.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../flutter/third_party/zlib/slide_hash_simd.h +---------------------------------------------------------------------------------------------------- +Copyright 2022 The Chromium Authors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +==================================================================================================== + ==================================================================================================== LIBRARY: boringssl ORIGIN: ../../../flutter/third_party/boringssl/src/pki/mock_signature_verify_cache.cc (with ../../../flutter/third_party/boringssl/src/LICENSE) @@ -55883,6 +56135,31 @@ May you find forgiveness for yourself and forgive others May you share freely, never taking more than you give. ==================================================================================================== +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/contrib/minizip/unzip.h +ORIGIN: ../../../flutter/third_party/zlib/contrib/minizip/zip.h +TYPE: LicenseType.zlib +FILE: ../../../flutter/third_party/zlib/contrib/minizip/unzip.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/zip.h +---------------------------------------------------------------------------------------------------- +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +==================================================================================================== + ==================================================================================================== LIBRARY: freetype2 ORIGIN: ../../../flutter/third_party/freetype2/src/base/md5.h @@ -67879,4 +68156,77 @@ Disclaimer and license similar terms. ==================================================================================================== -Total license count: 890 +==================================================================================================== +LIBRARY: zlib +ORIGIN: ../../../flutter/third_party/zlib/LICENSE +TYPE: LicenseType.zlib +FILE: ../../../flutter/third_party/zlib/chromeconf.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/ChangeLogUnzip +FILE: ../../../flutter/third_party/zlib/contrib/minizip/ioapi.c +FILE: ../../../flutter/third_party/zlib/contrib/minizip/ioapi.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/iowin32.c +FILE: ../../../flutter/third_party/zlib/contrib/minizip/iowin32.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/mztools.c +FILE: ../../../flutter/third_party/zlib/contrib/minizip/mztools.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/unzip.c +FILE: ../../../flutter/third_party/zlib/contrib/minizip/unzip.h +FILE: ../../../flutter/third_party/zlib/contrib/minizip/zip.c +FILE: ../../../flutter/third_party/zlib/contrib/minizip/zip.h +FILE: ../../../flutter/third_party/zlib/crc32.h +FILE: ../../../flutter/third_party/zlib/google/compression_utils.cc +FILE: ../../../flutter/third_party/zlib/google/compression_utils.h +FILE: ../../../flutter/third_party/zlib/google/redact.h +FILE: ../../../flutter/third_party/zlib/google/test_data.filelist +FILE: ../../../flutter/third_party/zlib/google/test_data.globlist +FILE: ../../../flutter/third_party/zlib/google/zip.cc +FILE: ../../../flutter/third_party/zlib/google/zip.h +FILE: ../../../flutter/third_party/zlib/google/zip_internal.cc +FILE: ../../../flutter/third_party/zlib/google/zip_internal.h +FILE: ../../../flutter/third_party/zlib/google/zip_reader.cc +FILE: ../../../flutter/third_party/zlib/google/zip_reader.h +FILE: ../../../flutter/third_party/zlib/google/zip_writer.cc +FILE: ../../../flutter/third_party/zlib/google/zip_writer.h +FILE: ../../../flutter/third_party/zlib/inffixed.h +FILE: ../../../flutter/third_party/zlib/patches/0000-build.patch +FILE: ../../../flutter/third_party/zlib/patches/0001-simd.patch +FILE: ../../../flutter/third_party/zlib/patches/0002-uninitializedcheck.patch +FILE: ../../../flutter/third_party/zlib/patches/0003-uninitializedjump.patch +FILE: ../../../flutter/third_party/zlib/patches/0004-fix-uwp.patch +FILE: ../../../flutter/third_party/zlib/patches/0005-infcover-gtest.patch +FILE: ../../../flutter/third_party/zlib/patches/0006-fix-check_match.patch +FILE: ../../../flutter/third_party/zlib/patches/0007-zero-init-deflate-window.patch +FILE: ../../../flutter/third_party/zlib/patches/0008-minizip-zip-unzip-tools.patch +FILE: ../../../flutter/third_party/zlib/patches/0009-infcover-oob.patch +FILE: ../../../flutter/third_party/zlib/patches/0010-cmake-enable-simd.patch +FILE: ../../../flutter/third_party/zlib/patches/0011-avx512.patch +FILE: ../../../flutter/third_party/zlib/patches/0012-lfs-open64.patch +FILE: ../../../flutter/third_party/zlib/patches/0013-cpu-feature-detection-for-arm.patch +FILE: ../../../flutter/third_party/zlib/patches/0014-minizip-unzip-with-incorrect-size.patch +FILE: ../../../flutter/third_party/zlib/patches/0015-minizip-unzip-enable-decryption.patch +FILE: ../../../flutter/third_party/zlib/patches/0016-minizip-parse-unicode-path-extra-field.patch +FILE: ../../../flutter/third_party/zlib/trees.h +FILE: ../../../flutter/third_party/zlib/zlib.map +FILE: ../../../flutter/third_party/zlib/zlib.pc.cmakein +---------------------------------------------------------------------------------------------------- +version 1.2.12, March 27th, 2022 + +Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +==================================================================================================== + +Total license count: 899 diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index 813b050e4b..9be17177f9 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 173cec9c47558a27df87b77cb01b4e00 +Signature: 95c63dc7dfaf942506f787b7127d83e5 diff --git a/engine/src/flutter/tools/licenses/lib/main.dart b/engine/src/flutter/tools/licenses/lib/main.dart index 8b17ccfcf2..e431a0106b 100644 --- a/engine/src/flutter/tools/licenses/lib/main.dart +++ b/engine/src/flutter/tools/licenses/lib/main.dart @@ -1436,9 +1436,6 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir if (entry.name == 'icu') { return _RepositoryIcuDirectory(this, entry); } - if (entry.name == 'zlib') { - return _RepositoryZLibDirectory(this, entry); - } return super.createSubdirectory(entry); } } @@ -1756,6 +1753,9 @@ class _RepositoryFlutterThirdPartyDirectory extends _RepositoryGenericThirdParty if (entry.name == 'vulkan-deps') { return _RepositoryGenericThirdPartyDirectory(this, entry); } + if (entry.name == 'zlib') { + return _RepositoryZLibDirectory(this, entry); + } return super.createSubdirectory(entry); } } diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index a07a310dce..fe0e22c03d 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -198,6 +198,8 @@ final Set skippedPaths = { r'flutter/third_party/wuffs/docs', r'flutter/third_party/wuffs/script', r'flutter/third_party/yapf', // only used for code formatting + r'flutter/third_party/zlib/contrib/minizip/miniunz.c', // sample file + r'flutter/third_party/zlib/contrib/minizip/minizip.c', // sample file r'flutter/tools', r'flutter/web_sdk', // this code is not linked into Flutter apps; it's only used by engine tests and tools r'fuchsia/sdk/linux/docs', @@ -221,8 +223,6 @@ final Set skippedPaths = { r'third_party/libcxxabi/www', r'third_party/libxml', // dependency of the testing system that we don't actually use r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies - r'third_party/zlib/contrib/minizip/miniunz.c', // sample file - r'third_party/zlib/contrib/minizip/minizip.c', // sample file r'tools', // not distributed in binary }; @@ -470,5 +470,5 @@ final List skippedFilePatterns = [ RegExp(r'^flutter/third_party/boringssl/src/crypto/fipsmodule/ec/[^/]+.go$'), RegExp(r'^flutter/third_party/dart/(?:.+/)*[^/]+_test\.[^/]+$'), RegExp(r'^flutter/third_party/freetype2/docs/(?!FTL\.TXT$).+'), // ignore all documentation except the license - RegExp(r'^third_party/zlib/(?:.+/)*[^/]+_unittest\.[^/]+$'), + RegExp(r'^flutter/third_party/zlib/(?:.+/)*[^/]+_unittest\.[^/]+$'), ];