Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit cae80d4

Browse files
cbrackenharryterkelsen
authored andcommitted
Move //third_party/glfw to //flutter/third_party/glfw (#46733)
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.
1 parent bd76ea0 commit cae80d4

File tree

13 files changed

+664
-664
lines changed

13 files changed

+664
-664
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ allowed_hosts = [
262262
]
263263

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

267267
# Fuchsia compatibility
268268
#
@@ -282,7 +282,7 @@ deps = {
282282
'src/third_party/libcxxabi':
283283
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
284284

285-
'src/third_party/glfw':
285+
'src/flutter/third_party/glfw':
286286
Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
287287

288288
'src/third_party/shaderc':

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function verify_licenses() (
156156

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

161161
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
162162
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,21 @@
430430
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
431431
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
432432
../../../flutter/third_party/accessibility/gfx/test
433+
../../../flutter/third_party/glfw/.appveyor.yml
434+
../../../flutter/third_party/glfw/.git
435+
../../../flutter/third_party/glfw/.gitattributes
436+
../../../flutter/third_party/glfw/.github
437+
../../../flutter/third_party/glfw/.gitignore
438+
../../../flutter/third_party/glfw/.mailmap
439+
../../../flutter/third_party/glfw/CMake
440+
../../../flutter/third_party/glfw/CMakeLists.txt
441+
../../../flutter/third_party/glfw/CONTRIBUTORS.md
442+
../../../flutter/third_party/glfw/README.md
443+
../../../flutter/third_party/glfw/deps
444+
../../../flutter/third_party/glfw/docs
445+
../../../flutter/third_party/glfw/examples
446+
../../../flutter/third_party/glfw/src/CMakeLists.txt
447+
../../../flutter/third_party/glfw/tests
433448
../../../flutter/third_party/gn
434449
../../../flutter/third_party/ninja
435450
../../../flutter/third_party/spring_animation/README.md
@@ -2021,21 +2036,6 @@
20212036
../../../third_party/freetype2/src/winfonts/rules.mk
20222037
../../../third_party/freetype2/tests
20232038
../../../third_party/freetype2/vms_make.com
2024-
../../../third_party/glfw/.appveyor.yml
2025-
../../../third_party/glfw/.git
2026-
../../../third_party/glfw/.gitattributes
2027-
../../../third_party/glfw/.github
2028-
../../../third_party/glfw/.gitignore
2029-
../../../third_party/glfw/.mailmap
2030-
../../../third_party/glfw/CMake
2031-
../../../third_party/glfw/CMakeLists.txt
2032-
../../../third_party/glfw/CONTRIBUTORS.md
2033-
../../../third_party/glfw/README.md
2034-
../../../third_party/glfw/deps
2035-
../../../third_party/glfw/docs
2036-
../../../third_party/glfw/examples
2037-
../../../third_party/glfw/src/CMakeLists.txt
2038-
../../../third_party/glfw/tests
20392039
../../../third_party/google_fonts_for_unit_tests
20402040
../../../third_party/googletest
20412041
../../../third_party/gradle

ci/licenses_golden/licenses_flutter

Lines changed: 635 additions & 1 deletion
Large diffs are not rendered by default.

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 636 deletions
Large diffs are not rendered by default.

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 575f2a41ff152394b7e539742fa248e6
1+
Signature: 2da12666eedd83b571506f27f8445d99
22

examples/glfw/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
1212

1313
deps = [
1414
"//flutter/shell/platform/embedder:embedder",
15-
"//third_party/glfw",
15+
"//flutter/third_party/glfw",
1616
]
1717
}
1818
}

examples/glfw_drm/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
1212

1313
deps = [
1414
"//flutter/shell/platform/embedder:embedder",
15-
"//third_party/glfw",
15+
"//flutter/third_party/glfw",
1616
]
1717

1818
libs = [ "EGL" ]

examples/vulkan_glfw/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ executable("vulkan_glfw") {
99

1010
deps = [
1111
"//flutter/shell/platform/embedder:embedder",
12-
"//third_party/glfw",
12+
"//flutter/third_party/glfw",
1313
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
1414
]
1515
}

impeller/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//third_party/glfw/glfw_args.gni")
5+
import("//flutter/third_party/glfw/glfw_args.gni")
66
import("tools/impeller.gni")
77

88
config("impeller_public_config") {

0 commit comments

Comments
 (0)