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 @@ -264,7 +264,7 @@ allowed_hosts = [
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63',

'src/third_party/rapidjson':
'src/flutter/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',

'src/third_party/harfbuzz':
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function verify_licenses() (

local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=39 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=43 # 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
50 changes: 25 additions & 25 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,31 @@
../../../flutter/third_party/gn
../../../flutter/third_party/imgui
../../../flutter/third_party/ninja
../../../flutter/third_party/rapidjson/.git
../../../flutter/third_party/rapidjson/.gitattributes
../../../flutter/third_party/rapidjson/.gitignore
../../../flutter/third_party/rapidjson/.gitmodules
../../../flutter/third_party/rapidjson/.travis.yml
../../../flutter/third_party/rapidjson/CHANGELOG.md
../../../flutter/third_party/rapidjson/CMakeLists.txt
../../../flutter/third_party/rapidjson/CMakeModules/FindGTestSrc.cmake
../../../flutter/third_party/rapidjson/README.fuchsia
../../../flutter/third_party/rapidjson/README.fuchsia.md
../../../flutter/third_party/rapidjson/RapidJSON.pc.in
../../../flutter/third_party/rapidjson/RapidJSONConfig.cmake.in
../../../flutter/third_party/rapidjson/RapidJSONConfigVersion.cmake.in
../../../flutter/third_party/rapidjson/appveyor.yml
../../../flutter/third_party/rapidjson/contrib
../../../flutter/third_party/rapidjson/doc
../../../flutter/third_party/rapidjson/docker/debian/Dockerfile
../../../flutter/third_party/rapidjson/example
../../../flutter/third_party/rapidjson/include_dirs.js
../../../flutter/third_party/rapidjson/library.json
../../../flutter/third_party/rapidjson/package.json
../../../flutter/third_party/rapidjson/rapidjson.autopkg
../../../flutter/third_party/rapidjson/readme.md
../../../flutter/third_party/rapidjson/readme.zh-cn.md
../../../flutter/third_party/rapidjson/test
../../../flutter/third_party/spring_animation/README.md
../../../flutter/third_party/test_shaders
../../../flutter/third_party/tonic/.clang-format
Expand Down Expand Up @@ -2570,31 +2595,6 @@
../../../third_party/pkg/vector_math
../../../third_party/protobuf
../../../third_party/pyyaml
../../../third_party/rapidjson/.git
../../../third_party/rapidjson/.gitattributes
../../../third_party/rapidjson/.gitignore
../../../third_party/rapidjson/.gitmodules
../../../third_party/rapidjson/.travis.yml
../../../third_party/rapidjson/CHANGELOG.md
../../../third_party/rapidjson/CMakeLists.txt
../../../third_party/rapidjson/CMakeModules/FindGTestSrc.cmake
../../../third_party/rapidjson/README.fuchsia
../../../third_party/rapidjson/README.fuchsia.md
../../../third_party/rapidjson/RapidJSON.pc.in
../../../third_party/rapidjson/RapidJSONConfig.cmake.in
../../../third_party/rapidjson/RapidJSONConfigVersion.cmake.in
../../../third_party/rapidjson/appveyor.yml
../../../third_party/rapidjson/contrib
../../../third_party/rapidjson/doc
../../../third_party/rapidjson/docker/debian/Dockerfile
../../../third_party/rapidjson/example
../../../third_party/rapidjson/include_dirs.js
../../../third_party/rapidjson/library.json
../../../third_party/rapidjson/package.json
../../../third_party/rapidjson/rapidjson.autopkg
../../../third_party/rapidjson/readme.md
../../../third_party/rapidjson/readme.zh-cn.md
../../../third_party/rapidjson/test
../../../third_party/root_certificates/.git
../../../third_party/root_certificates/README.google
../../../third_party/root_certificates/certdata.pem
Expand Down
145 changes: 144 additions & 1 deletion ci/licenses_golden/licenses_flutter

Large diffs are not rendered by default.

147 changes: 2 additions & 145 deletions ci/licenses_golden/licenses_third_party

Large diffs are not rendered by default.

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: f161ef7a408768b3ded7494d69263d9b
Signature: 126031993535612b0d5b22f7793aa786

2 changes: 1 addition & 1 deletion common/graphics/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ source_set("graphics") {
"//flutter/fml",
"//flutter/shell/common:base64",
"//flutter/shell/version:version",
"//flutter/third_party/rapidjson",
"//third_party/boringssl",
"//third_party/rapidjson",
"//third_party/skia",
]

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ source_set("ui") {
"//flutter/impeller/runtime_stage",
"//flutter/runtime:dart_plugin_registrant",
"//flutter/runtime:test_font",
"//flutter/third_party/rapidjson",
"//flutter/third_party/tonic",
"//third_party/dart/runtime/bin:dart_io_api",
"//third_party/rapidjson",
"//third_party/skia",
"//third_party/zlib:zlib",
]
Expand Down
2 changes: 1 addition & 1 deletion runtime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ source_set("runtime") {
public_deps = [
"//flutter/lib/gpu",
"//flutter/lib/ui",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]

public_configs = [ "//flutter:config" ]
Expand Down
4 changes: 2 additions & 2 deletions shell/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ source_set("common") {
":display",
":platform_message_handler",
"//flutter/shell/version",
"//flutter/third_party/rapidjson",
"//flutter/third_party/tonic",
"//flutter/third_party/txt",
"//third_party/rapidjson",
]

deps = [
Expand Down Expand Up @@ -258,7 +258,7 @@ if (enable_unittests) {
"//flutter/lib/ui",
"//flutter/testing:dart",
"//flutter/testing:fixture_test",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
"//third_party/skia",
]

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ source_set("common_cpp") {

public_deps = [
":common_cpp_core",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]
}

Expand Down
4 changes: 2 additions & 2 deletions shell/platform/darwin/ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@ source_set("ios_test_flutter_mrc") {
"//flutter/shell/common:common",
"//flutter/shell/platform/darwin/common:framework_common",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/third_party/rapidjson",
"//flutter/third_party/tonic",
"//flutter/third_party/txt",
"//third_party/ocmock:ocmock_shared",
"//third_party/rapidjson",
"//third_party/skia",
]

Expand Down Expand Up @@ -327,11 +327,11 @@ shared_library("ios_test_flutter") {
"//flutter/shell/platform/darwin/common:framework_common",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/shell/platform/embedder:embedder_test_utils",
"//flutter/third_party/rapidjson",
"//flutter/third_party/spring_animation",
"//flutter/third_party/tonic",
"//flutter/third_party/txt",
"//third_party/ocmock:ocmock_shared",
"//third_party/rapidjson",
"//third_party/skia",
]
public_configs = [
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ source_set("focus") {
"//build/fuchsia/pkg:sys_cpp_testing",
"//flutter/lib/ui",
"//flutter/testing",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]
}

Expand All @@ -41,6 +41,6 @@ source_set("pointer") {
"//build/fuchsia/pkg:sys_cpp_testing",
"//flutter/lib/ui",
"//flutter/testing",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]
}
2 changes: 1 addition & 1 deletion shell/platform/glfw/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ source_set("flutter_glfw") {
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
"//flutter/third_party/glfw",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]

if (is_linux) {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ source_set("flutter_linux_sources") {
"//flutter/shell/platform/common:common_cpp_input",
"//flutter/shell/platform/common:common_cpp_switches",
"//flutter/shell/platform/embedder:embedder_headers",
"//third_party/rapidjson",
"//flutter/third_party/rapidjson",
]
}

Expand Down
4 changes: 2 additions & 2 deletions shell/platform/windows/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ source_set("flutter_windows_source") {
"//flutter/shell/platform/common/client_wrapper:client_wrapper",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows",
"//flutter/third_party/rapidjson",
"//third_party/angle:libEGL_static", # the order of libEGL_static and
# libGLESv2_static is important.. if
# reversed, will cause a linker error
# DllMain already defined in
# LIBCMTD.lib
"//third_party/angle:libGLESv2_static",
"//third_party/rapidjson",
]
}

Expand Down Expand Up @@ -238,8 +238,8 @@ executable("flutter_windows_unittests") {
"//flutter/shell/platform/embedder:embedder_test_utils",
"//flutter/testing",
"//flutter/testing:dart",
"//flutter/third_party/rapidjson",
"//flutter/third_party/tonic",
"//third_party/rapidjson",
]
}

Expand Down
4 changes: 2 additions & 2 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,8 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
static final RegExp _licenseNamePattern = RegExp(r'^(?!.*\.py$)(?!.*(?:no|update)-copyright)(?!.*mh-bsd-gcc).*\b_*(?:license(?!\.html)|copying|copyright|notice|l?gpl|GPLv2|bsd|mit|mpl?|ftl|Apache)_*\b', caseSensitive: false);

static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
'/flutter/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
'/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
'/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
'/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
'/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
Expand All @@ -1041,8 +1043,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
'/third_party/libjpeg-turbo/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
'/third_party/libjpeg-turbo/README.ijg': _RepositoryReadmeIjgFile.new,
'/third_party/libpng/LICENSE': _RepositoryLibPngLicenseFile.new,
'/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
'/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
'/third_party/root_certificates/LICENSE': _RepositoryMpl2File.new,
'/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt': _RepositoryVulkanApacheLicenseFile.new,
'/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
Expand Down
4 changes: 2 additions & 2 deletions tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/gn',
r'flutter/third_party/imgui',
r'flutter/third_party/ninja', // build system
r'flutter/third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
r'flutter/third_party/rapidjson/doc', // documentation
r'flutter/third_party/test_shaders', // for tests only
r'flutter/third_party/txt/third_party/fonts',
r'flutter/tools',
Expand Down Expand Up @@ -160,8 +162,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/pkg/quiver',
r'third_party/pkg/vector_math',
r'third_party/pyyaml', // build-time dependency only
r'third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
r'third_party/rapidjson/doc', // documentation
r'third_party/root_certificates/certdata.pem',
r'third_party/root_certificates/certdata.txt',
r'third_party/shaderc/third_party/LICENSE.glslang', // unclear what the purpose of this file is
Expand Down