From a5e6f4282503f5cc7cbea330e57925fd2592293c Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Thu, 15 Aug 2019 08:00:57 -0700
Subject: [PATCH] Add _glfw versions of the GLFW desktop libraries

Part of restructuring the artifacts to support transitioning away from
GLFW embeddings on desktop.

https://github.com/flutter/flutter/issues/38589
---
 shell/platform/linux/BUILD.gn   | 13 +++++++++++++
 shell/platform/windows/BUILD.gn | 11 +++++++++++
 2 files changed, 24 insertions(+)

diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn
index 385b6d76b4648..cc23d93d6d0ba 100644
--- a/shell/platform/linux/BUILD.gn
+++ b/shell/platform/linux/BUILD.gn
@@ -10,6 +10,7 @@ group("linux") {
   if (build_glfw_shell) {
     deps = [
       ":flutter_linux",
+      ":flutter_linux_glfw",
       "$flutter_root/shell/platform/glfw:publish_headers_glfw",
       "$flutter_root/shell/platform/glfw/client_wrapper:publish_wrapper_glfw",
       "$flutter_root/shell/platform/glfw/client_wrapper:publish_wrapper_unprefixed",
@@ -28,6 +29,8 @@ config("disable_fatal_link_warnings") {
 }
 
 if (build_glfw_shell) {
+  # TODO: Remove this target once the _glfw copy is being uploaded instead. See
+  # https://github.com/flutter/flutter/issues/38589
   shared_library("flutter_linux") {
     deps = [
       "$flutter_root/shell/platform/glfw:flutter_glfw",
@@ -37,4 +40,14 @@ if (build_glfw_shell) {
 
     public_configs = [ "$flutter_root:config" ]
   }
+
+  shared_library("flutter_linux_glfw") {
+    deps = [
+      "$flutter_root/shell/platform/glfw:flutter_glfw",
+    ]
+
+    configs += [ ":disable_fatal_link_warnings" ]
+
+    public_configs = [ "$flutter_root:config" ]
+  }
 }
diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn
index fde9746556160..9c65762b8be36 100644
--- a/shell/platform/windows/BUILD.gn
+++ b/shell/platform/windows/BUILD.gn
@@ -100,6 +100,8 @@ shared_library("flutter_windows_win32") {
   public_configs = [ "$flutter_root:config" ]
 }
 
+# TODO: Remove this target once the _glfw copy is being uploaded instead. See
+# https://github.com/flutter/flutter/issues/38589
 shared_library("flutter_windows") {
   deps = [
     "$flutter_root/shell/platform/glfw:flutter_glfw",
@@ -108,6 +110,14 @@ shared_library("flutter_windows") {
   public_configs = [ "$flutter_root:config" ]
 }
 
+shared_library("flutter_windows_glfw") {
+  deps = [
+    "$flutter_root/shell/platform/glfw:flutter_glfw",
+  ]
+
+  public_configs = [ "$flutter_root:config" ]
+}
+
 group("windows_win32") {
   deps = [
     ":flutter_windows_win32",
@@ -119,6 +129,7 @@ group("windows_win32") {
 group("windows_glfw") {
   deps = [
     ":flutter_windows",
+    ":flutter_windows_glfw",
     "$flutter_root/shell/platform/glfw:publish_headers_glfw",
     "$flutter_root/shell/platform/glfw/client_wrapper:publish_wrapper_glfw",
     "$flutter_root/shell/platform/glfw/client_wrapper:publish_wrapper_unprefixed",