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
6 changes: 5 additions & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ vars = {
"upstream_boolean_selector": "https://github.com/dart-lang/boolean_selector.git",
"upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git",
"upstream_boringssl": "https://github.com/openssl/openssl.git",
"upstream_brotli": "https://github.com/google/brotli.git",
"upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git",
"upstream_buildroot": "https://github.com/flutter/buildroot.git",
"upstream_cli_util": "https://github.com/dart-lang/cli_util.git",
Expand Down Expand Up @@ -320,6 +321,9 @@ deps = {
'src/flutter/third_party/boringssl':
Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),

'src/flutter/third_party/brotli':
Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd',

'src/flutter/third_party/yapf':
Var('flutter_git') + '/third_party/yapf' + '@' + '212c5b5ad8e172d2d914ae454c121c89cccbcb35',

Expand Down Expand Up @@ -1006,7 +1010,7 @@ deps = {
'packages': [
{
'package': 'flutter/flutter_font_fallbacks',
'version': 'c81f5a2b369b48df3728d2b247a27901bb76bbce0c40b343fe1cc924a36b36ea'
'version': '91f2de34d4a309816a182ce7552201d95388e2e0bceea951a6dd04693ed6fe30'
}
],
'dep_type': 'cipd',
Expand Down
39 changes: 39 additions & 0 deletions build/secondary/third_party/brotli/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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.

source_root = "//flutter/third_party/brotli"

config("brotli_public") {
include_dirs = [
"$source_root/c/include",
"$source_root/c/common/dictionary.h",
]

cflags = []
foreach(dir, include_dirs) {
cflags += [
"-isystem",
rebase_path(dir),
]
}
}

static_library("brotli") {
# Brotli is used by freetype; it only needs the brotli decoder.
sources = [
"$source_root/c/common/constants.c",
"$source_root/c/common/context.c",
"$source_root/c/common/dictionary.c",
"$source_root/c/common/platform.c",
"$source_root/c/common/shared_dictionary.c",
"$source_root/c/common/transform.c",
"$source_root/c/dec/bit_reader.c",
"$source_root/c/dec/decode.c",
"$source_root/c/dec/huffman.c",
"$source_root/c/dec/state.c",
]

public_configs = [ ":brotli_public" ]
cflags = [ "-w" ]
}
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function verify_licenses() (

local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=909 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=918

if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="
Expand Down
27 changes: 27 additions & 0 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,33 @@
../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.json
../../../flutter/third_party/boringssl/src/third_party/wycheproof_testvectors/xchacha20_poly1305_test.txt
../../../flutter/third_party/boringssl/src/util
../../../flutter/third_party/brotli/.editorconfig
../../../flutter/third_party/brotli/.git
../../../flutter/third_party/brotli/.gitattributes
../../../flutter/third_party/brotli/.github
../../../flutter/third_party/brotli/.gitignore
../../../flutter/third_party/brotli/BUILD.bazel
../../../flutter/third_party/brotli/CHANGELOG.md
../../../flutter/third_party/brotli/CMakeLists.txt
../../../flutter/third_party/brotli/CONTRIBUTING.md
../../../flutter/third_party/brotli/MANIFEST.in
../../../flutter/third_party/brotli/README
../../../flutter/third_party/brotli/README.md
../../../flutter/third_party/brotli/SECURITY.md
../../../flutter/third_party/brotli/WORKSPACE.bazel
../../../flutter/third_party/brotli/c/fuzz/.bazelrc
../../../flutter/third_party/brotli/c/fuzz/BUILD.bazel
../../../flutter/third_party/brotli/c/fuzz/WORKSPACE.bazel
../../../flutter/third_party/brotli/csharp
../../../flutter/third_party/brotli/docs
../../../flutter/third_party/brotli/go
../../../flutter/third_party/brotli/java
../../../flutter/third_party/brotli/js
../../../flutter/third_party/brotli/python
../../../flutter/third_party/brotli/research
../../../flutter/third_party/brotli/scripts
../../../flutter/third_party/brotli/setup.py
../../../flutter/third_party/brotli/tests
../../../flutter/third_party/cpu_features/src/.clang-format
../../../flutter/third_party/cpu_features/src/.git
../../../flutter/third_party/cpu_features/src/.github
Expand Down
Loading