Skip to content

Commit

Permalink
Move //third_party/glfw to //flutter/third_party/glfw (flutter#46733)
Browse files Browse the repository at this point in the history
As part of eliminating the Flutter buildroot (#67373), we are moving all
third-party dependencies from //third_party to //flutter/third_party.

This is the engine-side follow-up to flutter/buildroot#777.

Once all third-party dependencies have been migrated, tooling and config
will be moved and the buildroot will be eliminated altogether.

Issue: flutter/flutter#136284

No tests changed because there is no semantic change to this PR. This is
simply relocating a dependency.
  • Loading branch information
cbracken authored Oct 11, 2023
1 parent 66d5de5 commit e41c646
Show file tree
Hide file tree
Showing 13 changed files with 664 additions and 664 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '5d60bd2eb4642b64d00c845e5ca9f1ea41fd6db6',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '1d2965f9b0f784abea8ddbeb54827afa9ed196b9',

# Fuchsia compatibility
#
Expand All @@ -282,7 +282,7 @@ deps = {
'src/third_party/libcxxabi':
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',

'src/third_party/glfw':
'src/flutter/third_party/glfw':
Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',

'src/third_party/shaderc':
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=20 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=39 # 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
30 changes: 15 additions & 15 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,21 @@
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
../../../flutter/third_party/accessibility/gfx/test
../../../flutter/third_party/glfw/.appveyor.yml
../../../flutter/third_party/glfw/.git
../../../flutter/third_party/glfw/.gitattributes
../../../flutter/third_party/glfw/.github
../../../flutter/third_party/glfw/.gitignore
../../../flutter/third_party/glfw/.mailmap
../../../flutter/third_party/glfw/CMake
../../../flutter/third_party/glfw/CMakeLists.txt
../../../flutter/third_party/glfw/CONTRIBUTORS.md
../../../flutter/third_party/glfw/README.md
../../../flutter/third_party/glfw/deps
../../../flutter/third_party/glfw/docs
../../../flutter/third_party/glfw/examples
../../../flutter/third_party/glfw/src/CMakeLists.txt
../../../flutter/third_party/glfw/tests
../../../flutter/third_party/gn
../../../flutter/third_party/ninja
../../../flutter/third_party/spring_animation/README.md
Expand Down Expand Up @@ -2021,21 +2036,6 @@
../../../third_party/freetype2/src/winfonts/rules.mk
../../../third_party/freetype2/tests
../../../third_party/freetype2/vms_make.com
../../../third_party/glfw/.appveyor.yml
../../../third_party/glfw/.git
../../../third_party/glfw/.gitattributes
../../../third_party/glfw/.github
../../../third_party/glfw/.gitignore
../../../third_party/glfw/.mailmap
../../../third_party/glfw/CMake
../../../third_party/glfw/CMakeLists.txt
../../../third_party/glfw/CONTRIBUTORS.md
../../../third_party/glfw/README.md
../../../third_party/glfw/deps
../../../third_party/glfw/docs
../../../third_party/glfw/examples
../../../third_party/glfw/src/CMakeLists.txt
../../../third_party/glfw/tests
../../../third_party/google_fonts_for_unit_tests
../../../third_party/googletest
../../../third_party/gradle
Expand Down
636 changes: 635 additions & 1 deletion ci/licenses_golden/licenses_flutter

Large diffs are not rendered by default.

638 changes: 2 additions & 636 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: 575f2a41ff152394b7e539742fa248e6
Signature: 2da12666eedd83b571506f27f8445d99

2 changes: 1 addition & 1 deletion examples/glfw/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (build_embedder_examples) {

deps = [
"//flutter/shell/platform/embedder:embedder",
"//third_party/glfw",
"//flutter/third_party/glfw",
]
}
}
2 changes: 1 addition & 1 deletion examples/glfw_drm/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (build_embedder_examples) {

deps = [
"//flutter/shell/platform/embedder:embedder",
"//third_party/glfw",
"//flutter/third_party/glfw",
]

libs = [ "EGL" ]
Expand Down
2 changes: 1 addition & 1 deletion examples/vulkan_glfw/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ executable("vulkan_glfw") {

deps = [
"//flutter/shell/platform/embedder:embedder",
"//third_party/glfw",
"//flutter/third_party/glfw",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
]
}
2 changes: 1 addition & 1 deletion impeller/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//third_party/glfw/glfw_args.gni")
import("//flutter/third_party/glfw/glfw_args.gni")
import("tools/impeller.gni")

config("impeller_public_config") {
Expand Down
2 changes: 1 addition & 1 deletion impeller/playground/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impeller_component("playground") {
"../scene/shaders",
"imgui:imgui_impeller_backend",
"//flutter/fml",
"//third_party/glfw",
"//flutter/third_party/glfw",
"//third_party/imgui:imgui_glfw",
]

Expand Down
2 changes: 1 addition & 1 deletion shell/platform/glfw/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ source_set("flutter_glfw") {
"//flutter/shell/platform/common/client_wrapper:client_wrapper",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
"//third_party/glfw",
"//flutter/third_party/glfw",
"//third_party/rapidjson",
]

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 @@ -29,6 +29,8 @@ final Set<String> skippedPaths = <String>{
r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
r'flutter/prebuilts',
r'flutter/sky/packages/sky_engine/LICENSE',
r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build.
r'flutter/third_party/glfw/docs',
r'flutter/third_party/gn',
r'flutter/third_party/ninja', // build system
r'flutter/third_party/test_shaders', // for tests only
Expand Down Expand Up @@ -98,8 +100,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/fontconfig', // not used in standard configurations
r'third_party/freetype2/builds',
r'third_party/freetype2/src/tools',
r'third_party/glfw/deps', // Only used by examples and tests; not linked in build.
r'third_party/glfw/docs',
r'third_party/gradle',
r'third_party/harfbuzz/docs',
r'third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
Expand Down

0 comments on commit e41c646

Please sign in to comment.