Revert "Build GLFW from source for Linux shell (flutter#8327)"

This reverts commit f4a6dc9.
RBogie · Apr 8, 2019 · a49ad93 · a49ad93
1 parent 727df62
commit a49ad93
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/DEPS b/DEPS
@@ -121,7 +121,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ad098fcdb1b41fcf57c22e46e898d0dc04d3a178',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ee817fb84542865e253bcce1866bc13e4065ca4d',
 
    # Fuchsia compatibility
    #

diff --git a/build/install-build-deps-linux-desktop.sh b/build/install-build-deps-linux-desktop.sh
@@ -8,4 +8,4 @@
 
 set -e
 
-sudo apt-get -y install libgtk-3-dev libx11-dev
+sudo apt-get -y install libglfw3-dev libgtk-3-dev libx11-dev
diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn
@@ -52,14 +52,14 @@ source_set("flutter_glfw") {
     "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper",
     "$flutter_root/shell/platform/embedder:embedder",
     "$flutter_root/shell/platform/glfw/client_wrapper:client_wrapper_glfw",
-    "//build/secondary/third_party/glfw",
     "//third_party/rapidjson",
   ]
 
   if (is_linux) {
     libs = [ "GL" ]
 
     configs += [
+      "$flutter_root/shell/platform/linux/config:glfw3",
       "$flutter_root/shell/platform/linux/config:gtk3",
       "$flutter_root/shell/platform/linux/config:x11",
     ]

diff --git a/shell/platform/linux/config/BUILD.gn b/shell/platform/linux/config/BUILD.gn
@@ -4,6 +4,10 @@
 
 import("//build/config/linux/pkg_config.gni")
 
+pkg_config("glfw3") {
+  packages = [ "glfw3" ]
+}
+
 pkg_config("gtk3") {
   packages = [ "gtk+-3.0" ]
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@

		set -e

		sudo apt-get -y install libgtk-3-dev libx11-dev
		sudo apt-get -y install libglfw3-dev libgtk-3-dev libx11-dev