Roll reclient, libpng, and zlib (#52072)
Based on https://github.com/flutter/engine/pull/52067
diff --git a/DEPS b/DEPS
index 8020cdf..4e9b95b 100644
--- a/DEPS
+++ b/DEPS
@@ -50,7 +50,7 @@
# https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',
- 'reclient_version': 'git_revision:f61c232b70bc425f0b562480312b114c444d460d',
+ 'reclient_version': 'git_revision:2c9285bdffcfd1b21afb028d57494ff78761af81',
'gcloud_version': 'version:2@444.0.0.chromium.3',
@@ -656,7 +656,7 @@
Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
'src/flutter/third_party/libpng':
- Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
+ Var('flutter_git') + '/third_party/libpng' + '@' + 'de36b892e921c684ef718fec24739ae9bb49c977',
'src/flutter/third_party/libwebp':
Var('chromium_git') + '/webm/libwebp.git' + '@' + 'ca332209cb5567c9b249c86788cb2dbf8847e760', # 1.3.2
@@ -665,7 +665,10 @@
Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
'src/third_party/zlib':
- Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
+ Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df',
+
+ 'src/flutter/third_party/cpu_features/src':
+ Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e',
'src/flutter/third_party/inja':
Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
diff --git a/build/secondary/flutter/third_party/libwebp/BUILD.gn b/build/secondary/flutter/third_party/libwebp/BUILD.gn
index 5753b66..0ef2e82 100644
--- a/build/secondary/flutter/third_party/libwebp/BUILD.gn
+++ b/build/secondary/flutter/third_party/libwebp/BUILD.gn
@@ -53,7 +53,7 @@
deps = [ ":libwebp_sse41" ]
if (is_android) {
- deps += [ "//third_party/cpu-features" ]
+ deps += [ "//third_party/cpu_features:ndk_compat" ]
}
configs += [ ":libwebp_defines" ]
diff --git a/build/secondary/third_party/cpu_features/BUILD.gn b/build/secondary/third_party/cpu_features/BUILD.gn
new file mode 100644
index 0000000..bd1cae1
--- /dev/null
+++ b/build/secondary/third_party/cpu_features/BUILD.gn
@@ -0,0 +1,7 @@
+# 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("ndk_compat") {
+ public_deps = [ "//flutter/third_party/cpu_features:ndk_compat" ]
+}
diff --git a/ci/licenses.sh b/ci/licenses.sh
index 1f59876..b1dc4ce 100755
--- a/ci/licenses.sh
+++ b/ci/licenses.sh
@@ -174,7 +174,7 @@
local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
- local expectedLicenseCount=888 # When changing this number: Update the error message below as well describing the newly expected license types.
+ local expectedLicenseCount=890 # 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/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index 4346d38..f2eb85b 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -1328,6 +1328,21 @@
../../../flutter/third_party/boringssl/win-aarch64/crypto/test
../../../flutter/third_party/boringssl/win-x86/crypto/test
../../../flutter/third_party/boringssl/win-x86_64/crypto/test
+../../../flutter/third_party/cpu_features/src/.clang-format
+../../../flutter/third_party/cpu_features/src/.git
+../../../flutter/third_party/cpu_features/src/.github
+../../../flutter/third_party/cpu_features/src/.gitignore
+../../../flutter/third_party/cpu_features/src/BUILD.bazel
+../../../flutter/third_party/cpu_features/src/CMakeLists.txt
+../../../flutter/third_party/cpu_features/src/CONTRIBUTING.md
+../../../flutter/third_party/cpu_features/src/README.md
+../../../flutter/third_party/cpu_features/src/WORKSPACE
+../../../flutter/third_party/cpu_features/src/bazel/ci/README.md
+../../../flutter/third_party/cpu_features/src/bazel/platforms.bzl
+../../../flutter/third_party/cpu_features/src/cmake
+../../../flutter/third_party/cpu_features/src/ndk_compat/CMakeLists.txt
+../../../flutter/third_party/cpu_features/src/ndk_compat/README.md
+../../../flutter/third_party/cpu_features/src/test
../../../flutter/third_party/dart
../../../flutter/third_party/dart/.clang-format
../../../flutter/third_party/dart/.dart_tool
@@ -2100,7 +2115,10 @@
../../../flutter/third_party/libjpeg-turbo/src/simd/CMakeLists.txt
../../../flutter/third_party/libjpeg-turbo/src/structure.txt
../../../flutter/third_party/libjpeg-turbo/src/wrjpgcom.1
+../../../flutter/third_party/libpng/.appveyor.yml
+../../../flutter/third_party/libpng/.editorconfig
../../../flutter/third_party/libpng/.git
+../../../flutter/third_party/libpng/.gitignore
../../../flutter/third_party/libpng/.travis.yml
../../../flutter/third_party/libpng/ANNOUNCE
../../../flutter/third_party/libpng/AUTHORS
@@ -2112,10 +2130,12 @@
../../../flutter/third_party/libpng/TODO
../../../flutter/third_party/libpng/TRADEMARK
../../../flutter/third_party/libpng/aclocal.m4
+../../../flutter/third_party/libpng/ci
../../../flutter/third_party/libpng/contrib
../../../flutter/third_party/libpng/libpng-manual.txt
../../../flutter/third_party/libpng/libpng.3
../../../flutter/third_party/libpng/libpngpf.3
+../../../flutter/third_party/libpng/loongarch
../../../flutter/third_party/libpng/mips
../../../flutter/third_party/libpng/png.5
../../../flutter/third_party/libpng/powerpc
@@ -3500,13 +3520,13 @@
../../../third_party/zlib/DIR_METADATA
../../../third_party/zlib/OWNERS
../../../third_party/zlib/README.chromium
-../../../third_party/zlib/contrib/bench/OWNERS
../../../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
@@ -3514,5 +3534,6 @@
../../../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/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 54ad493..d1eb6ae 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -294,6 +294,247 @@
====================================================================================================
====================================================================================================
+LIBRARY: cpu_features
+ORIGIN: ../../../flutter/third_party/cpu_features/src/LICENSE
+TYPE: LicenseType.apache
+FILE: ../../../flutter/third_party/cpu_features/src/.dockerignore
+FILE: ../../../flutter/third_party/cpu_features/src/.grenrc.yml
+FILE: ../../../flutter/third_party/cpu_features/src/ndk_compat/cpu-features.c
+FILE: ../../../flutter/third_party/cpu_features/src/ndk_compat/ndk-compat-test.c
+FILE: ../../../flutter/third_party/cpu_features/src/scripts/generate_badges.d
+----------------------------------------------------------------------------------------------------
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+For files in the `ndk_compat` folder:
+
+
+Copyright (C) 2010 The Android Open Source Project
+All rights reserved.
+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.
+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: flatbuffers
ORIGIN: ../../../flutter/third_party/flatbuffers/dart/LICENSE
TYPE: LicenseType.apache
@@ -509,6 +750,7 @@
====================================================================================================
LIBRARY: abseil-cpp
LIBRARY: angle
+LIBRARY: cpu_features
LIBRARY: expat
LIBRARY: flatbuffers
LIBRARY: glslang
@@ -745,6 +987,43 @@
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/common/vulkan/vk_google_filtering_precision.h
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpu_features_cache_info.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpu_features_macros.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_aarch64.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_arm.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_mips.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_ppc.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_riscv.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_s390x.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/cpuinfo_x86.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/bit_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/cpuid_x86.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/filesystem.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/hwcaps.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/stack_line_reader.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/string_view.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/include/internal/windows_utils.h
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/copy.inl
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/define_introspection.inl
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/define_introspection_and_hwcaps.inl
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/equals.inl
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/filesystem.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/hwcaps.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_aarch64_linux_or_android.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_aarch64_windows.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_arm_linux_or_android.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_mips_linux_or_android.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_ppc_linux.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_riscv_linux.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_s390x_linux.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_x86__base_implementation.inl
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_x86_freebsd.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_x86_linux_or_android.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_x86_macos.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/impl_x86_windows.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/stack_line_reader.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/string_view.c
+ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/cpu_features/src/src/utils/list_cpu_features.c
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/expat/expat/fuzz/xml_parse_fuzzer.c
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c
ORIGIN: http://www.apache.org/licenses/LICENSE-2.0 referenced by ../../../flutter/third_party/flatbuffers/conan/test_package/test_package.cpp
@@ -3149,6 +3428,43 @@
FILE: ../../../flutter/third_party/angle/src/common/vulkan/vk_google_filtering_precision.h
FILE: ../../../flutter/third_party/angle/src/libANGLE/Overlay_font_autogen.cpp
FILE: ../../../flutter/third_party/angle/src/libANGLE/overlay/RobotoMono-Bold.ttf
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpu_features_cache_info.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpu_features_macros.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_aarch64.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_arm.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_mips.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_ppc.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_riscv.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_s390x.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/cpuinfo_x86.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/bit_utils.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/cpuid_x86.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/filesystem.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/hwcaps.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/stack_line_reader.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/string_view.h
+FILE: ../../../flutter/third_party/cpu_features/src/include/internal/windows_utils.h
+FILE: ../../../flutter/third_party/cpu_features/src/src/copy.inl
+FILE: ../../../flutter/third_party/cpu_features/src/src/define_introspection.inl
+FILE: ../../../flutter/third_party/cpu_features/src/src/define_introspection_and_hwcaps.inl
+FILE: ../../../flutter/third_party/cpu_features/src/src/equals.inl
+FILE: ../../../flutter/third_party/cpu_features/src/src/filesystem.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/hwcaps.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_aarch64_linux_or_android.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_aarch64_windows.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_arm_linux_or_android.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_mips_linux_or_android.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_ppc_linux.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_riscv_linux.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_s390x_linux.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_x86__base_implementation.inl
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_x86_freebsd.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_x86_linux_or_android.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_x86_macos.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/impl_x86_windows.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/stack_line_reader.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/string_view.c
+FILE: ../../../flutter/third_party/cpu_features/src/src/utils/list_cpu_features.c
FILE: ../../../flutter/third_party/expat/expat/fuzz/xml_parse_fuzzer.c
FILE: ../../../flutter/third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c
FILE: ../../../flutter/third_party/flatbuffers/composer.json
@@ -8392,6 +8708,7 @@
ORIGIN: ../../../flutter/third_party/libpng/LICENSE
ORIGIN: ../../../flutter/third_party/libpng/png.h
TYPE: LicenseType.libpng
+FILE: ../../../flutter/third_party/libpng/.yamllint.yml
FILE: ../../../flutter/third_party/libpng/arm/arm_init.c
FILE: ../../../flutter/third_party/libpng/arm/filter_neon.S
FILE: ../../../flutter/third_party/libpng/arm/filter_neon_intrinsics.c
@@ -8437,8 +8754,8 @@
PNG Reference Library License version 2
---------------------------------------
-* Copyright (c) 1995-2019 The PNG Reference Library Authors.
-* Copyright (c) 2018-2019 Cosmin Truta.
+* Copyright (c) 1995-2024 The PNG Reference Library Authors.
+* Copyright (c) 2018-2024 Cosmin Truta.
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* Copyright (c) 1996-1997 Andreas Dilger.
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -22914,6 +23231,39 @@
====================================================================================================
====================================================================================================
+LIBRARY: cpu_features
+ORIGIN: ../../../flutter/third_party/cpu_features/src/ndk_compat/cpu-features.h
+TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/cpu_features/src/ndk_compat/cpu-features.h
+----------------------------------------------------------------------------------------------------
+Copyright (C) 2010 The Android Open Source Project
+All rights reserved.
+
+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.
+
+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: icu
ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d1.ucm + ../../../flutter/third_party/icu/LICENSE
ORIGIN: ../../../flutter/third_party/icu/source/data/mappings/icu-internal-compound-d2.ucm + ../../../flutter/third_party/icu/LICENSE
@@ -67533,4 +67883,4 @@
similar terms.
====================================================================================================
-Total license count: 888
+Total license count: 890
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index 312f7fb..4cfebb9 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: be8ce23f4fb161952d9fa6424a6bf111
+Signature: 5446d10c4b2c8969c53ee1b3d6358bad
====================================================================================================
LIBRARY: libcxx
@@ -1952,11 +1952,12 @@
FILE: ../../../third_party/zlib/uncompr.c
FILE: ../../../third_party/zlib/zconf.h
FILE: ../../../third_party/zlib/zconf.h.cmakein
+FILE: ../../../third_party/zlib/zconf.h.in
FILE: ../../../third_party/zlib/zlib.h
FILE: ../../../third_party/zlib/zutil.c
FILE: ../../../third_party/zlib/zutil.h
----------------------------------------------------------------------------------------------------
-Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
+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
@@ -2421,6 +2422,11 @@
FILE: ../../../third_party/zlib/patches/0009-infcover-oob.patch
FILE: ../../../third_party/zlib/patches/0010-cmake-enable-simd.patch
FILE: ../../../third_party/zlib/patches/0011-avx512.patch
+FILE: ../../../third_party/zlib/patches/0012-lfs-open64.patch
+FILE: ../../../third_party/zlib/patches/0013-cpu-feature-detection-for-arm.patch
+FILE: ../../../third_party/zlib/patches/0014-minizip-unzip-with-incorrect-size.patch
+FILE: ../../../third_party/zlib/patches/0015-minizip-unzip-enable-decryption.patch
+FILE: ../../../third_party/zlib/patches/0016-minizip-parse-unicode-path-extra-field.patch
FILE: ../../../third_party/zlib/trees.h
FILE: ../../../third_party/zlib/zlib.map
FILE: ../../../third_party/zlib/zlib.pc.cmakein
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index cef40dc..813b050 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 81502e69b5cbecb68460df211a14a760
+Signature: 173cec9c47558a27df87b77cb01b4e00
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png
index 5410b75..e71bfa8 100644
--- a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png
+++ b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png
Binary files differ
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png
index 5f08106..3d69815 100644
--- a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png
+++ b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png
Binary files differ
diff --git a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png
index 5335435..1ee3dd7 100644
--- a/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png
+++ b/lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png
Binary files differ
diff --git a/lib/ui/fixtures/Horizontal.png b/lib/ui/fixtures/Horizontal.png
index 8a11228..92aa8ed 100644
--- a/lib/ui/fixtures/Horizontal.png
+++ b/lib/ui/fixtures/Horizontal.png
Binary files differ
diff --git a/lib/ui/fixtures/four_frame_with_reuse_end.png b/lib/ui/fixtures/four_frame_with_reuse_end.png
index b0433f9..5e7f54a 100644
--- a/lib/ui/fixtures/four_frame_with_reuse_end.png
+++ b/lib/ui/fixtures/four_frame_with_reuse_end.png
Binary files differ
diff --git a/lib/ui/fixtures/heart_end.png b/lib/ui/fixtures/heart_end.png
index 5fd9a70..c770119 100644
--- a/lib/ui/fixtures/heart_end.png
+++ b/lib/ui/fixtures/heart_end.png
Binary files differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png
index bdec9bc..eb7d6ec 100644
--- a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png
+++ b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png
Binary files differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png
index 6ade80e..b73dc14 100644
--- a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png
+++ b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png
Binary files differ
diff --git a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png
index c3006d0..590207d 100644
--- a/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png
+++ b/lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png
Binary files differ
diff --git a/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png b/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png
index 7c67236..0e71341 100644
--- a/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png
+++ b/lib/ui/fixtures/impeller_four_frame_with_reuse_end.png
Binary files differ
diff --git a/lib/ui/fixtures/impeller_heart_end.png b/lib/ui/fixtures/impeller_heart_end.png
index cd33ff0..38c34d3 100644
--- a/lib/ui/fixtures/impeller_heart_end.png
+++ b/lib/ui/fixtures/impeller_heart_end.png
Binary files differ
diff --git a/shell/common/fixtures/shelltest_screenshot.png b/shell/common/fixtures/shelltest_screenshot.png
index 3ad7d7e..26f5b38 100644
--- a/shell/common/fixtures/shelltest_screenshot.png
+++ b/shell/common/fixtures/shelltest_screenshot.png
Binary files differ
diff --git a/testing/resources/performance_overlay_gold_120fps.png b/testing/resources/performance_overlay_gold_120fps.png
index 9677724..20bb1f8 100644
--- a/testing/resources/performance_overlay_gold_120fps.png
+++ b/testing/resources/performance_overlay_gold_120fps.png
Binary files differ
diff --git a/testing/resources/performance_overlay_gold_60fps.png b/testing/resources/performance_overlay_gold_60fps.png
index 0d45210..5e5dd02 100644
--- a/testing/resources/performance_overlay_gold_60fps.png
+++ b/testing/resources/performance_overlay_gold_60fps.png
Binary files differ
diff --git a/testing/resources/performance_overlay_gold_90fps.png b/testing/resources/performance_overlay_gold_90fps.png
index d6fb7e8..77a12ab 100644
--- a/testing/resources/performance_overlay_gold_90fps.png
+++ b/testing/resources/performance_overlay_gold_90fps.png
Binary files differ
diff --git a/testing/resources/square.png b/testing/resources/square.png
index a042cec..78a8b66 100644
--- a/testing/resources/square.png
+++ b/testing/resources/square.png
Binary files differ
diff --git a/third_party/cpu_features/BUILD.gn b/third_party/cpu_features/BUILD.gn
new file mode 100644
index 0000000..45e51b3
--- /dev/null
+++ b/third_party/cpu_features/BUILD.gn
@@ -0,0 +1,61 @@
+# 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("cpu_features_config") {
+ cflags = [ "-Wno-unused-function" ]
+ defines = [
+ "STACK_LINE_READER_BUFFER_SIZE=1024",
+ "HAVE_STRONG_GETAUXVAL",
+ ]
+ include_dirs = [ "src/include" ]
+}
+
+config("ndk_compat_headers") {
+ include_dirs = [ "src/ndk_compat" ]
+}
+
+source_set("cpuinfo") {
+ sources = [
+ "src/src/copy.inl",
+ "src/src/define_introspection.inl",
+ "src/src/define_introspection_and_hwcaps.inl",
+ "src/src/equals.inl",
+ "src/src/filesystem.c",
+ "src/src/hwcaps.c",
+ "src/src/stack_line_reader.c",
+ "src/src/string_view.c",
+ ]
+ if (current_cpu == "x86" || current_cpu == "x64") {
+ sources += [
+ "src/src/impl_x86__base_implementation.inl",
+ "src/src/impl_x86_freebsd.c",
+ "src/src/impl_x86_linux_or_android.c",
+ "src/src/impl_x86_macos.c",
+ "src/src/impl_x86_windows.c",
+ ]
+ } else if (current_cpu == "arm") {
+ sources += [ "src/src/impl_arm_linux_or_android.c" ]
+ } else if (current_cpu == "arm64") {
+ sources += [ "src/src/impl_aarch64_linux_or_android.c" ]
+ } else if (current_cpu == "mips") {
+ sources += [ "src/src/impl_mips_linux_or_android.c" ]
+ } else if (current_cpu == "ppc") {
+ sources += [ "src/src/impl_ppc_linux.c" ]
+ } else if (current_cpu == "riscv64") {
+ sources += [ "src/src/impl_riscv_linux.c" ]
+ } else {
+ error("Missing definition for architecture: $current_cpu")
+ }
+ configs += [ ":cpu_features_config" ]
+}
+
+source_set("ndk_compat") {
+ sources = [
+ "src/ndk_compat/cpu-features.c",
+ "src/ndk_compat/cpu-features.h",
+ ]
+ configs += [ ":cpu_features_config" ]
+ public_configs = [ ":ndk_compat_headers" ]
+ deps = [ ":cpuinfo" ]
+}
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
index 1ec5307..a07a310 100644
--- a/tools/licenses/lib/paths.dart
+++ b/tools/licenses/lib/paths.dart
@@ -102,7 +102,9 @@
r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
r'flutter/third_party/inja/third_party/include/doctest', // seems to be a unit test library
r'flutter/third_party/json/docs',
+ r'flutter/third_party/libpng/ci', // not linked in
r'flutter/third_party/libpng/contrib', // not linked in
+ r'flutter/third_party/libpng/loongarch', // not linked in
r'flutter/third_party/libpng/mips', // not linked in
r'flutter/third_party/libpng/powerpc', // not linked in
r'flutter/third_party/libpng/projects', // not linked in
diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart
index 2405532..74674f7 100644
--- a/tools/licenses/lib/patterns.dart
+++ b/tools/licenses/lib/patterns.dart
@@ -49,8 +49,8 @@
r'|// The copyright below was added in 2009, but I see no record'
r'|This ICU code derived from:'
r'|the contents of which are also included in zip.h' // seen in minizip's unzip.c, but the upshot of the crazy license situation there is that we don't have to do anything
- r'|" inflate 1\.2\.1\d Copyright 1995-2022 Mark Adler ";'
- r'|" deflate 1\.2\.1\d Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";'
+ r'|" inflate 1\.3\.0\.\d Copyright 1995-2023 Mark Adler ";'
+ r'|" deflate 1\.3\.0\.\d Copyright 1995-2023 Jean-loup Gailly and Mark Adler ";'
r'|const char zip_copyright\[\] =" zip 1\.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";'
r'|#define JCOPYRIGHT_SHORT "Copyright \(C\) 1991-2016 The libjpeg-turbo Project and many others"'
r"|r'[^']*©[^']*'" // e.g. flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
