Skip to content

Commit

Permalink
Move //third_party/glfw to //flutter/third_party/glfw
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
  • Loading branch information
cbracken committed Oct 10, 2023
1 parent 7fb5d07 commit ad193e5
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ pubspec.lock
docs/doxygen/
xcuserdata

# directories pulled in via deps or hooks
third_party/glfw/
third_party/gn/
third_party/ninja/ninja*

Expand Down
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' + '@' + 'c462465d22423946cc6ecf02d2ccf26df147540d',

# 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 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

0 comments on commit ad193e5

Please sign in to comment.