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
Show file tree
Hide file tree
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
Expand Up @@ -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]',

Expand Down Expand Up @@ -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
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/flutter/third_party/libwebp/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
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
Expand Up @@ -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 ==============================="
Expand Down
23 changes: 22 additions & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Loading