Roll dart, zlib, emscripten, tweak license script for rolled zlib (#41299)
Changes since last dart roll
```
1f224df52be Version 3.1.0-15.0.dev
3c284a0c95c Revert "Reland "[VM] Begin supporting Perfetto file recorder""
754aca00499 Bump github/codeql-action from 2.2.11 to 2.2.12
7c8e61104f6 Bump actions/checkout from 3.5.0 to 3.5.2
f9f1030959d (origin/base) [infra] DEPS and test dart-lang/native packages
b04b0844067 [vm/win7] Dynamically load functions for unwinding instructions.
a6ebd6fa8e9 Bump tools to 545d7e1c73ce21b8c91f638021f9d487d324a501
c4795a75508 [vm, compiler] Don't do safepoint transitions in generated code under TSAN.
2fcf9754032 Version 3.1.0-14.0.dev
393b1016292 Version 3.1.0-13.0.dev
39fc15a0b4c (origin/lkgr) [analysis_server] Add missing declaration semantic token modifier on classes/constructors
609db33dc7a Issue 51985. Quick fix to add missing pattern case to switch expression/pattern.
8fa08ae80b6 Add 'Convert to if-case statement' quick assist.
17d92f90d0b offer wildcard suggestions for destructured record fields
3149f813bbf [dartdev] Update --enable-analytics to re-enable unified analytics
eee509140dd Add dependency overrides for pkg/analyzer
3069c4f3e2b [analysis_server] Add missing "constructor" semantic token modifiers on constructor declarations
9834f87c542 [dart2js] Fix noSuchMethod override handling.
639a6f06ef9 Simplify several non-terminals to use regex-like grammar operators
f88e3bd77c5 Issue 51903. Test fixes for ParserErrorCode.VAR_AND_TYPE
f4d42303ad2 [analysis_server] Handle completion in whitespace after string values
70762f0de0e [ANTLR] Transform recursive definition of onParts to use iteration ...
453647022f6 [analysis_server] Don't fail on invalid/complex setters in LSP code completion
a565638b910 Issue 51689. Report when 'super' is used as a standalone expression, not as a receiver of an invocation.
b78d89ce0c7 Fix DynamicTypeImpl to InterfaceTypeImpl cast exception in AddTypeAnnotation, when ambiguous SetOrMapLiteral.
bd9c7a46e2b Roll zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f
18b5ecdfc99 [vm] Cleanup dead code around TypeArgumentClassFinder
9d4d48949c0 Add a top-level variable strict-inference test case
8df1b888771 [VM/Service] Create JSONBase64String class
b4aa83b0b7f [VM/Service] Rename JSONStream::AppendSerializedObject to JSONStream::AppendBytes
4cd9c9c6666 Reland "[VM] Begin supporting Perfetto file recorder"
fa3a72fa7e5 [cfe/ffi] Error on compound constructors
```
diff --git a/DEPS b/DEPS
index 3760662..7d8382a 100644
--- a/DEPS
+++ b/DEPS
@@ -47,7 +47,7 @@
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
- 'dart_revision': 'a335e6724332400693e23808845ae0533730552d',
+ 'dart_revision': '1f224df52bee4f120ad1600e78a731face84d76d',
# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -68,7 +68,7 @@
'dart_webdev_rev': '75462913fba9756e9ddae33bfd73fe96f5199c34',
'dart_webkit_inspection_protocol_rev': '8401098ace995e4dcd9855a2741c2dacccaa780b',
'dart_yaml_edit_rev': '5f392a1511ab97dde0e4a6bb7225f283f59ea840',
- 'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
+ 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -319,7 +319,7 @@
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
'src/third_party/dart/third_party/devtools':
- {'packages': [{'version': 'git_revision:026f0adf03725fbab24d601ac74c811808f258e5', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+ {'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:026f0adf03725fbab24d601ac74c811808f258e5'}], 'dep_type': 'cipd'},
'src/third_party/dart/third_party/pkg/args':
Var('dart_git') + '/args.git@5ac2ba1d93f037c7aee2975703bf071f88597a76',
@@ -487,7 +487,7 @@
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
'src/third_party/dart/tools/sdks':
- {'packages': [{'version': 'version:3.0.0-369.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+ {'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.0.0-369.0.dev'}], 'dep_type': 'cipd'},
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
@@ -769,7 +769,7 @@
},
'src/buildtools/emsdk': {
- 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07',
+ 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'da9699832b5df4e123403490e499c87000c22654',
'condition': 'download_emsdk',
},
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index 963bb80..f043797 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -2308,6 +2308,8 @@
../../../third_party/libpng/aclocal.m4
../../../third_party/libpng/contrib
../../../third_party/libpng/libpng-manual.txt
+../../../third_party/libpng/libpng.3
+../../../third_party/libpng/libpngpf.3
../../../third_party/libpng/mips
../../../third_party/libpng/png.5
../../../third_party/libpng/powerpc
@@ -3043,11 +3045,13 @@
../../../third_party/wuffs/sync.txt
../../../third_party/yapf
../../../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/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
@@ -3059,4 +3063,5 @@
../../../third_party/zlib/google/zip_reader_unittest.cc
../../../third_party/zlib/google/zip_unittest.cc
../../../third_party/zlib/patches/README
+../../../third_party/zlib/zlib.3
../../../tools
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index 8ad582e..82c364f 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: c59b84f00148ce4051d9571543f8831f
+Signature: ed96a56c53cd826ad02fcf45852b1758
====================================================================================================
LIBRARY: angle
@@ -9200,9 +9200,7 @@
FILE: ../../../third_party/libpng/example.c
FILE: ../../../third_party/libpng/intel/filter_sse2_intrinsics.c
FILE: ../../../third_party/libpng/intel/intel_init.c
-FILE: ../../../third_party/libpng/libpng.3
FILE: ../../../third_party/libpng/libpng.pc.in
-FILE: ../../../third_party/libpng/libpngpf.3
FILE: ../../../third_party/libpng/png.c
FILE: ../../../third_party/libpng/png.h
FILE: ../../../third_party/libpng/pngbar.jpg
@@ -10778,6 +10776,7 @@
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/zlib.h
FILE: ../../../third_party/zlib/zutil.c
FILE: ../../../third_party/zlib/zutil.h
@@ -28364,7 +28363,7 @@
FILE: ../../../third_party/zlib/contrib/optimizations/chunkcopy.h
----------------------------------------------------------------------------------------------------
Copyright (C) 2017 ARM, Inc.
-Copyright 2017 The Chromium Authors. All rights reserved.
+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
@@ -35733,22 +35732,13 @@
====================================================================================================
LIBRARY: angle
-LIBRARY: zlib
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/containers/mru_cache.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/sha1.cc + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/sha1.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_internal.cc + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_internal.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_reader.h + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/angle/src/common/base/anglebase/containers/mru_cache.h
FILE: ../../../third_party/angle/src/common/base/anglebase/sha1.cc
FILE: ../../../third_party/angle/src/common/base/anglebase/sha1.h
-FILE: ../../../third_party/zlib/google/zip.h
-FILE: ../../../third_party/zlib/google/zip_internal.cc
-FILE: ../../../third_party/zlib/google/zip_internal.h
-FILE: ../../../third_party/zlib/google/zip_reader.h
----------------------------------------------------------------------------------------------------
Copyright (c) 2011 The Chromium Authors. All rights reserved.
@@ -36108,43 +36098,6 @@
====================================================================================================
====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/google/zip.cc + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_reader.cc + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/google/zip.cc
-FILE: ../../../third_party/zlib/google/zip_reader.cc
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2012 The Chromium Authors. 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.
- * 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: ../../../third_party/boringssl/src/crypto/cipher_extra/tls_cbc.c
TYPE: LicenseType.bsd
@@ -41746,41 +41699,6 @@
====================================================================================================
====================================================================================================
-LIBRARY: zlib
-ORIGIN: ../../../third_party/zlib/google/redact.h + ../../../LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../third_party/zlib/google/redact.h
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2022 The Chromium Authors. 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.
- * 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: dart
ORIGIN: ../../../third_party/dart/runtime/bin/test_utils.cc + ../../../third_party/dart/LICENSE
ORIGIN: ../../../third_party/dart/runtime/bin/test_utils.h + ../../../third_party/dart/LICENSE
@@ -44710,18 +44628,13 @@
====================================================================================================
LIBRARY: angle
LIBRARY: icu
-LIBRARY: zlib
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_conversions.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_conversions_impl.h + ../../../LICENSE
ORIGIN: ../../../third_party/icu/icu.isolate + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/compression_utils.cc + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/compression_utils.h + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_conversions.h
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_conversions_impl.h
FILE: ../../../third_party/icu/icu.isolate
-FILE: ../../../third_party/zlib/google/compression_utils.cc
-FILE: ../../../third_party/zlib/google/compression_utils.h
----------------------------------------------------------------------------------------------------
Copyright 2014 The Chromium Authors. All rights reserved.
@@ -46003,8 +45916,48 @@
====================================================================================================
====================================================================================================
-LIBRARY: angle
LIBRARY: zlib
+ORIGIN: ../../../third_party/zlib/adler32_simd.c + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/adler32_simd.h + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/crc32_simd.c + ../../../LICENSE
+ORIGIN: ../../../third_party/zlib/crc32_simd.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/zlib/adler32_simd.c
+FILE: ../../../third_party/zlib/adler32_simd.h
+FILE: ../../../third_party/zlib/crc32_simd.c
+FILE: ../../../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: angle
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/checked_math.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/checked_math_impl.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/clamped_math.h + ../../../LICENSE
@@ -46016,13 +45969,6 @@
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_arm_impl.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_clang_gcc_impl.h + ../../../LICENSE
ORIGIN: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_shared_impl.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/adler32_simd.c + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/adler32_simd.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/chromeconf.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/crc32_simd.c + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/crc32_simd.h + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_writer.cc + ../../../LICENSE
-ORIGIN: ../../../third_party/zlib/google/zip_writer.h + ../../../LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/checked_math.h
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/checked_math_impl.h
@@ -46035,13 +45981,6 @@
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_arm_impl.h
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_clang_gcc_impl.h
FILE: ../../../third_party/angle/src/common/base/anglebase/numerics/safe_math_shared_impl.h
-FILE: ../../../third_party/zlib/adler32_simd.c
-FILE: ../../../third_party/zlib/adler32_simd.h
-FILE: ../../../third_party/zlib/chromeconf.h
-FILE: ../../../third_party/zlib/crc32_simd.c
-FILE: ../../../third_party/zlib/crc32_simd.h
-FILE: ../../../third_party/zlib/google/zip_writer.cc
-FILE: ../../../third_party/zlib/google/zip_writer.h
----------------------------------------------------------------------------------------------------
Copyright 2017 The Chromium Authors. All rights reserved.
@@ -46908,18 +46847,50 @@
====================================================================================================
====================================================================================================
-LIBRARY: angle
LIBRARY: zlib
-ORIGIN: ../../../third_party/angle/src/common/base/anglebase/no_destructor.h + ../../../LICENSE
ORIGIN: ../../../third_party/zlib/contrib/bench/zlib_bench.cc + ../../../LICENSE
ORIGIN: ../../../third_party/zlib/cpu_features.c + ../../../LICENSE
ORIGIN: ../../../third_party/zlib/cpu_features.h + ../../../LICENSE
TYPE: LicenseType.bsd
-FILE: ../../../third_party/angle/src/common/base/anglebase/no_destructor.h
FILE: ../../../third_party/zlib/contrib/bench/zlib_bench.cc
FILE: ../../../third_party/zlib/cpu_features.c
FILE: ../../../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: angle
+ORIGIN: ../../../third_party/angle/src/common/base/anglebase/no_destructor.h + ../../../LICENSE
+TYPE: LicenseType.bsd
+FILE: ../../../third_party/angle/src/common/base/anglebase/no_destructor.h
+----------------------------------------------------------------------------------------------------
Copyright 2018 The Chromium Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -47484,7 +47455,7 @@
FILE: ../../../third_party/zlib/google/compression_utils_portable.cc
FILE: ../../../third_party/zlib/google/compression_utils_portable.h
----------------------------------------------------------------------------------------------------
-Copyright 2019 The Chromium Authors. All rights reserved.
+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
@@ -48847,7 +48818,7 @@
TYPE: LicenseType.bsd
FILE: ../../../third_party/zlib/slide_hash_simd.h
----------------------------------------------------------------------------------------------------
-Copyright 2022 The Chromium Authors. All rights reserved.
+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
@@ -65986,6 +65957,7 @@
LIBRARY: zlib
ORIGIN: ../../../third_party/zlib/LICENSE
TYPE: LicenseType.zlib
+FILE: ../../../third_party/zlib/chromeconf.h
FILE: ../../../third_party/zlib/contrib/minizip/ChangeLogUnzip
FILE: ../../../third_party/zlib/contrib/minizip/ioapi.c
FILE: ../../../third_party/zlib/contrib/minizip/ioapi.h
@@ -65998,6 +65970,19 @@
FILE: ../../../third_party/zlib/contrib/minizip/zip.c
FILE: ../../../third_party/zlib/contrib/minizip/zip.h
FILE: ../../../third_party/zlib/crc32.h
+FILE: ../../../third_party/zlib/google/compression_utils.cc
+FILE: ../../../third_party/zlib/google/compression_utils.h
+FILE: ../../../third_party/zlib/google/redact.h
+FILE: ../../../third_party/zlib/google/test_data.filelist
+FILE: ../../../third_party/zlib/google/test_data.globlist
+FILE: ../../../third_party/zlib/google/zip.cc
+FILE: ../../../third_party/zlib/google/zip.h
+FILE: ../../../third_party/zlib/google/zip_internal.cc
+FILE: ../../../third_party/zlib/google/zip_internal.h
+FILE: ../../../third_party/zlib/google/zip_reader.cc
+FILE: ../../../third_party/zlib/google/zip_reader.h
+FILE: ../../../third_party/zlib/google/zip_writer.cc
+FILE: ../../../third_party/zlib/google/zip_writer.h
FILE: ../../../third_party/zlib/inffixed.h
FILE: ../../../third_party/zlib/patches/0000-build.patch
FILE: ../../../third_party/zlib/patches/0001-simd.patch
@@ -66009,7 +65994,11 @@
FILE: ../../../third_party/zlib/patches/0007-zero-init-deflate-window.patch
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/trees.h
+FILE: ../../../third_party/zlib/zlib.map
+FILE: ../../../third_party/zlib/zlib.pc.cmakein
----------------------------------------------------------------------------------------------------
version 1.2.12, March 27th, 2022
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index 09e63ac..0e38359 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 61adfda2905179c8e8b7d754d8660a7f
+Signature: aabe540615f08ecf9c89970cdec802bc
diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE
index 7bdf0ac..c337484 100644
--- a/sky/packages/sky_engine/LICENSE
+++ b/sky/packages/sky_engine/LICENSE
@@ -15982,7 +15982,7 @@
zlib
Copyright (C) 2017 ARM, Inc.
-Copyright 2017 The Chromium Authors. All rights reserved.
+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
@@ -22037,7 +22037,6 @@
--------------------------------------------------------------------------------
accessibility
angle
-zlib
Copyright (c) 2011 The Chromium Authors. All rights reserved.
@@ -22228,7 +22227,6 @@
written authorization of the copyright holder.
--------------------------------------------------------------------------------
accessibility
-zlib
Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -23895,36 +23893,6 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------------------
-zlib
-
-Copyright (c) 2022 The Chromium Authors. 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.
- * 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.
---------------------------------------------------------------------------------
dart
Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
@@ -25829,7 +25797,6 @@
accessibility
angle
icu
-zlib
Copyright 2014 The Chromium Authors. All rights reserved.
@@ -26460,9 +26427,38 @@
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
+zlib
+
+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.
+--------------------------------------------------------------------------------
accessibility
angle
-zlib
Copyright 2017 The Chromium Authors. All rights reserved.
@@ -26810,11 +26806,40 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
+zlib
+
+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.
+--------------------------------------------------------------------------------
accessibility
angle
fuchsia_sdk
skia
-zlib
Copyright 2018 The Chromium Authors. All rights reserved.
@@ -27133,9 +27158,38 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
+zlib
+
+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.
+--------------------------------------------------------------------------------
accessibility
fuchsia_sdk
-zlib
Copyright 2019 The Chromium Authors. All rights reserved.
@@ -27928,7 +27982,7 @@
--------------------------------------------------------------------------------
zlib
-Copyright 2022 The Chromium Authors. All rights reserved.
+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
diff --git a/tools/activate_emsdk.py b/tools/activate_emsdk.py
index 9b4e3ae..9b0d11d 100644
--- a/tools/activate_emsdk.py
+++ b/tools/activate_emsdk.py
@@ -16,7 +16,7 @@
EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
# See lib/web_ui/README.md for instructions on updating the EMSDK version.
-EMSDK_VERSION = '3.1.3'
+EMSDK_VERSION = '3.1.32'
def main():
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
index 5e136a1..fe9bd51 100644
--- a/tools/licenses/lib/paths.dart
+++ b/tools/licenses/lib/paths.dart
@@ -410,6 +410,7 @@
// Keep this list in lexical order.
final Set<String> skippedCommonExtensions = <String>{
r'.1',
+ r'.3',
r'.5',
r'.autopkg',
r'.build',
diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart
index cba12a2..f3a1c0f 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\.12 Copyright 1995-2022 Mark Adler ";'
- r'|" deflate 1\.2\.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";'
+ 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'|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
@@ -330,7 +330,7 @@
// the comment decoration in the captured match, otherwise it won't be
// stripped from the second line when generating output.
r'((?: \* Copyright \(C\) 2017 ARM, Inc.\n)?'
- r'Copyright .+(The .+ Authors)\. +All rights reserved\.)\n'
+ r'Copyright .+(The .+ Authors)(?:\. +All rights reserved\.)?)\n'
r'Use of this source code is governed by a BSD-style license that can be\n'
r'found in the Chromium source repository ([^ ]+) file.'.replaceAll(r'\n', _linebreakLoose),
multiLine: true,
