Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Roll reclient, libpng, and zlib #52072

Merged
merged 5 commits into from
Apr 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ vars = {
# 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:[email protected]',

@@ -656,7 +656,7 @@ deps = {
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 @@ deps = {
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',
2 changes: 1 addition & 1 deletion build/secondary/flutter/third_party/libwebp/BUILD.gn
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ source_set("libwebp") {
deps = [ ":libwebp_sse41" ]

if (is_android) {
deps += [ "//third_party/cpu-features" ]
deps += [ "//third_party/cpu_features:ndk_compat" ]
}

configs += [ ":libwebp_defines" ]
7 changes: 7 additions & 0 deletions build/secondary/third_party/cpu_features/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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" ]
}
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
@@ -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=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 ==============================="
23 changes: 22 additions & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
@@ -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,19 +3520,20 @@
../../../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
../../../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
356 changes: 353 additions & 3 deletions ci/licenses_golden/licenses_flutter

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: be8ce23f4fb161952d9fa6424a6bf111
Signature: 5446d10c4b2c8969c53ee1b3d6358bad

====================================================================================================
LIBRARY: libcxx
@@ -1952,11 +1952,12 @@ FILE: ../../../third_party/zlib/trees.c
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/0008-minizip-zip-unzip-tools.patch
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
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 81502e69b5cbecb68460df211a14a760
Signature: 173cec9c47558a27df87b77cb01b4e00

Binary file modified lib/ui/fixtures/2_dispose_op_restore_previous.apng.67.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/2_dispose_op_restore_previous.apng.68.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/2_dispose_op_restore_previous.apng.69.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/Horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/four_frame_with_reuse_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/heart_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.67.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.68.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/impeller_2_dispose_op_restore_previous.apng.69.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/impeller_four_frame_with_reuse_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/ui/fixtures/impeller_heart_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shell/common/fixtures/shelltest_screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified testing/resources/performance_overlay_gold_120fps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified testing/resources/performance_overlay_gold_60fps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified testing/resources/performance_overlay_gold_90fps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified testing/resources/square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 61 additions & 0 deletions third_party/cpu_features/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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" ]
}
2 changes: 2 additions & 0 deletions tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
@@ -102,7 +102,9 @@ final Set<String> skippedPaths = <String>{
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
4 changes: 2 additions & 2 deletions tools/licenses/lib/patterns.dart
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ final RegExp copyrightMentionOkPattern = RegExp(
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