Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit dd79390

Browse files
authored
Revert "Add a Linux Shell that uses GTK for rendering. (#16977)"
This reverts commit c93b67a.
1 parent 61cda39 commit dd79390

File tree

9 files changed

+1
-574
lines changed

9 files changed

+1
-574
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,11 +1145,6 @@ FILE: ../../../flutter/shell/platform/glfw/platform_handler.h
11451145
FILE: ../../../flutter/shell/platform/glfw/public/flutter_glfw.h
11461146
FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.cc
11471147
FILE: ../../../flutter/shell/platform/glfw/text_input_plugin.h
1148-
FILE: ../../../flutter/shell/platform/linux/fl_dart_project.cc
1149-
FILE: ../../../flutter/shell/platform/linux/fl_view.cc
1150-
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_dart_project.h
1151-
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_view.h
1152-
FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/flutter_linux.h
11531148
FILE: ../../../flutter/shell/platform/windows/angle_surface_manager.cc
11541149
FILE: ../../../flutter/shell/platform/windows/angle_surface_manager.h
11551150
FILE: ../../../flutter/shell/platform/windows/client_wrapper/dart_project_unittests.cc

shell/platform/linux/BUILD.gn

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,15 @@
55
assert(is_linux)
66

77
import("//flutter/shell/platform/glfw/config.gni")
8-
import("//flutter/shell/platform/linux/config.gni")
98

109
group("linux") {
11-
deps = []
1210
if (build_glfw_shell) {
13-
deps += [
11+
deps = [
1412
":flutter_linux_glfw",
1513
"//flutter/shell/platform/glfw:publish_headers_glfw",
1614
"//flutter/shell/platform/glfw/client_wrapper:publish_wrapper_glfw",
1715
]
1816
}
19-
if (build_linux_shell) {
20-
deps += [
21-
":flutter_linux_gtk",
22-
":publish_headers_linux",
23-
]
24-
}
2517
}
2618

2719
# Temporary workaround for the issue describe in
@@ -45,49 +37,3 @@ if (build_glfw_shell) {
4537
public_configs = [ "//flutter:config" ]
4638
}
4739
}
48-
49-
if (build_linux_shell) {
50-
_public_headers = [
51-
"public/flutter_linux/fl_dart_project.h",
52-
"public/flutter_linux/fl_view.h",
53-
"public/flutter_linux/flutter_linux.h",
54-
]
55-
56-
config("relative_flutter_linux_headers") {
57-
include_dirs = [ "public" ]
58-
}
59-
60-
source_set("flutter_linux") {
61-
sources = [
62-
"fl_dart_project.cc",
63-
"fl_view.cc",
64-
]
65-
66-
configs += [
67-
"//flutter/shell/platform/linux/config:gtk",
68-
"//flutter/shell/platform/linux/config:egl",
69-
]
70-
71-
# Set flag to stop headers being directly included (library users should not do this)
72-
defines = [ "FLUTTER_LINUX_COMPILATION" ]
73-
74-
deps = [
75-
"//flutter/shell/platform/embedder:embedder_with_symbol_prefix",
76-
]
77-
}
78-
79-
shared_library("flutter_linux_gtk") {
80-
deps = [
81-
":flutter_linux",
82-
]
83-
84-
public_configs = [ "//flutter:config" ]
85-
}
86-
87-
copy("publish_headers_linux") {
88-
sources = _public_headers
89-
outputs = [
90-
"$root_out_dir/flutter_linux/{{source_file_part}}",
91-
]
92-
}
93-
}

shell/platform/linux/config.gni

Lines changed: 0 additions & 11 deletions
This file was deleted.

shell/platform/linux/config/BUILD.gn

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,7 @@
33
# found in the LICENSE file.
44

55
import("//build/config/linux/pkg_config.gni")
6-
import("//flutter/shell/platform/linux/config.gni")
76

87
pkg_config("x11") {
98
packages = [ "x11" ]
109
}
11-
12-
if (build_linux_shell) {
13-
pkg_config("gtk") {
14-
packages = [ "gtk+-3.0" ]
15-
}
16-
pkg_config("egl") {
17-
packages = [ "egl" ]
18-
}
19-
}

shell/platform/linux/fl_dart_project.cc

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)