Move //third_party/glfw to //flutter/third_party/glfw

cbracken · cbracken · commit 60e331387e45 · 2023-10-10T13:37:02.000-07:00
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
diff --git a/DEPS b/DEPS
@@ -262,7 +262,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5d60bd2eb4642b64d00c845e5ca9f1ea41fd6db6',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '88b37b93ed10af9d5e7bc4e0568f6aa24de2ca42',
 
    # Fuchsia compatibility
    #
@@ -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':
diff --git a/examples/glfw/BUILD.gn b/examples/glfw/BUILD.gn
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
 
     deps = [
       "//flutter/shell/platform/embedder:embedder",
-      "//third_party/glfw",
+      "//flutter/third_party/glfw",
     ]
   }
 }
diff --git a/examples/glfw_drm/BUILD.gn b/examples/glfw_drm/BUILD.gn
@@ -12,7 +12,7 @@ if (build_embedder_examples) {
 
     deps = [
       "//flutter/shell/platform/embedder:embedder",
-      "//third_party/glfw",
+      "//flutter/third_party/glfw",
     ]
 
     libs = [ "EGL" ]
diff --git a/examples/vulkan_glfw/BUILD.gn b/examples/vulkan_glfw/BUILD.gn
@@ -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",
   ]
 }
diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
@@ -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") {
diff --git a/impeller/playground/BUILD.gn b/impeller/playground/BUILD.gn
@@ -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",
   ]
 
diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn
@@ -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",
   ]
 

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ allowed_hosts = [`
`262`	`262`	`]`
`263`	`263`
`264`	`264`	`deps = {`
`265`		`- 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5d60bd2eb4642b64d00c845e5ca9f1ea41fd6db6',`
	`265`	`+ 'src': 'https://github.com/flutter/buildroot.git' + '@' + '88b37b93ed10af9d5e7bc4e0568f6aa24de2ca42',`
`266`	`266`
`267`	`267`	`# Fuchsia compatibility`
`268`	`268`	`#`
`@@ -282,7 +282,7 @@ deps = {`
`282`	`282`	`'src/third_party/libcxxabi':`
`283`	`283`	`Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',`
`284`	`284`
`285`		`- 'src/third_party/glfw':`
	`285`	`+ 'src/flutter/third_party/glfw':`
`286`	`286`	`Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',`
`287`	`287`
`288`	`288`	`'src/third_party/shaderc':`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ if (build_embedder_examples) {`
`12`	`12`
`13`	`13`	`deps = [`
`14`	`14`	`"//flutter/shell/platform/embedder:embedder",`
`15`		`- "//third_party/glfw",`
	`15`	`+ "//flutter/third_party/glfw",`
`16`	`16`	`]`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ executable("vulkan_glfw") {`
`9`	`9`
`10`	`10`	`deps = [`
`11`	`11`	`"//flutter/shell/platform/embedder:embedder",`
`12`		`- "//third_party/glfw",`
	`12`	`+ "//flutter/third_party/glfw",`
`13`	`13`	`"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",`
`14`	`14`	`]`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ impeller_component("playground") {`
`47`	`47`	`"../scene/shaders",`
`48`	`48`	`"imgui:imgui_impeller_backend",`
`49`	`49`	`"//flutter/fml",`
`50`		`- "//third_party/glfw",`
	`50`	`+ "//flutter/third_party/glfw",`
`51`	`51`	`"//third_party/imgui:imgui_glfw",`
`52`	`52`	`]`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ source_set("flutter_glfw") {`
`59`	`59`	`"//flutter/shell/platform/common/client_wrapper:client_wrapper",`
`60`	`60`	`"//flutter/shell/platform/embedder:embedder_as_internal_library",`
`61`	`61`	`"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw",`
`62`		`- "//third_party/glfw",`
	`62`	`+ "//flutter/third_party/glfw",`
`63`	`63`	`"//third_party/rapidjson",`
`64`	`64`	`]`
`65`	`65`