From 747c196efdeb186decfcea5023582c8c2c60048a Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 20 Aug 2019 16:44:53 -0700 Subject: [PATCH 1/3] Remove unprefixed GLFW client wrapper --- shell/platform/glfw/client_wrapper/BUILD.gn | 8 -------- shell/platform/linux/BUILD.gn | 1 - shell/platform/windows/BUILD.gn | 1 - 3 files changed, 10 deletions(-) diff --git a/shell/platform/glfw/client_wrapper/BUILD.gn b/shell/platform/glfw/client_wrapper/BUILD.gn index 6eb4d4ca9a630..72bcf4f971f2d 100644 --- a/shell/platform/glfw/client_wrapper/BUILD.gn +++ b/shell/platform/glfw/client_wrapper/BUILD.gn @@ -44,14 +44,6 @@ source_set("client_wrapper_glfw") { ] } -# Copies the GLFW client wrapper code to the output directory in the legacy -# unsuffixed location. -# TODO: Remove this copy once build recipes are using the _glfw version below. -publish_client_wrapper_extension("publish_wrapper_unprefixed") { - public = _wrapper_includes - sources = _wrapper_sources -} - # Copies the GLFW client wrapper code to the output directory with a _glfw # suffix. publish_client_wrapper_extension("publish_wrapper_glfw") { diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn index cc23d93d6d0ba..1cb6178a144c1 100644 --- a/shell/platform/linux/BUILD.gn +++ b/shell/platform/linux/BUILD.gn @@ -13,7 +13,6 @@ group("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", ] } } diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn index 9c65762b8be36..f099250bfc27b 100644 --- a/shell/platform/windows/BUILD.gn +++ b/shell/platform/windows/BUILD.gn @@ -132,7 +132,6 @@ group("windows_glfw") { ":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", ] } From f9c224df8d1a72ba1e4001c06a7cfd5d3ec23a55 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 20 Aug 2019 16:55:20 -0700 Subject: [PATCH 2/3] Remove suffixes from Win32 Windows build output --- shell/platform/windows/BUILD.gn | 24 ++++--------------- .../platform/windows/client_wrapper/BUILD.gn | 4 +--- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn index f099250bfc27b..3eda081ddffea 100644 --- a/shell/platform/windows/BUILD.gn +++ b/shell/platform/windows/BUILD.gn @@ -92,19 +92,9 @@ copy("publish_headers_windows") { ] } -shared_library("flutter_windows_win32") { - deps = [ - ":flutter_windows_source", - ] - - 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", + ":flutter_windows_source", ] public_configs = [ "$flutter_root:config" ] @@ -118,14 +108,6 @@ shared_library("flutter_windows_glfw") { public_configs = [ "$flutter_root:config" ] } -group("windows_win32") { - deps = [ - ":flutter_windows_win32", - ":publish_headers_windows", - "$flutter_root/shell/platform/windows/client_wrapper:publish_wrapper_windows", - ] -} - group("windows_glfw") { deps = [ ":flutter_windows", @@ -137,7 +119,9 @@ group("windows_glfw") { group("windows") { deps = [ - ":windows_win32", + ":flutter_windows", + ":publish_headers_windows", + "$flutter_root/shell/platform/windows/client_wrapper:publish_wrapper_windows", ] if (build_glfw_shell) { deps += [ ":windows_glfw" ] diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn index bbd48c67df33a..b31a70cbd9c4f 100644 --- a/shell/platform/windows/client_wrapper/BUILD.gn +++ b/shell/platform/windows/client_wrapper/BUILD.gn @@ -40,12 +40,10 @@ source_set("client_wrapper_windows") { ] } -# Copies the Windows client wrapper code to the output directory with a _windows -# suffix. +# Copies the Windows client wrapper code to the output directory. publish_client_wrapper_extension("publish_wrapper_windows") { public = _wrapper_includes sources = _wrapper_sources - directory_suffix = "windows" } source_set("client_wrapper_library_stubs_windows") { From f39372b395c13e369e851c1d779c1d6a3fe032a0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 20 Aug 2019 16:56:37 -0700 Subject: [PATCH 3/3] Remove un-suffixed Linux GLFW library --- shell/platform/linux/BUILD.gn | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn index 1cb6178a144c1..e1aa61bd21fb8 100644 --- a/shell/platform/linux/BUILD.gn +++ b/shell/platform/linux/BUILD.gn @@ -9,7 +9,6 @@ import("$flutter_root/shell/platform/glfw/config.gni") 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", @@ -28,18 +27,6 @@ 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", - ] - - configs += [ ":disable_fatal_link_warnings" ] - - public_configs = [ "$flutter_root:config" ] - } - shared_library("flutter_linux_glfw") { deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw",