Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
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
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
19 changes: 19 additions & 0 deletions build/secondary/third_party/zlib/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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" ]
}
12 changes: 12 additions & 0 deletions build/secondary/third_party/zlib/google/BUILD.gn
Original file line number Diff line number Diff line change
@@ -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" ]
}
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=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 ==============================="
Expand Down
42 changes: 21 additions & 21 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_dart
Original file line number Diff line number Diff line change
Expand Up @@ -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/

====================================================================================================
Expand Down
Loading