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

Commit 463e877

Browse files
zandersozanderso
committed
Don't use Skia BUILD.gn files
1 parent a9e0f95 commit 463e877

File tree

37 files changed

+1323
-55
lines changed

37 files changed

+1323
-55
lines changed

‎common/graphics/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ source_set("graphics") {
2626
"//flutter/fml",
2727
"//flutter/shell/common:base64",
2828
"//flutter/shell/version:version",
29+
"//flutter/skia",
2930
"//flutter/third_party/rapidjson",
3031
"//third_party/boringssl",
31-
"//third_party/skia",
3232
]
3333

3434
public_configs = [ "//flutter:config" ]

‎display_list/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ source_set("display_list") {
8888
"//flutter/fml",
8989
"//flutter/impeller/runtime_stage",
9090
"//flutter/impeller/typographer",
91-
"//third_party/skia",
91+
"//flutter/skia",
9292
]
9393

9494
if (!defined(defines)) {
@@ -218,10 +218,10 @@ source_set("display_list_benchmarks_source") {
218218
"//flutter/display_list/testing:display_list_surface_provider",
219219
"//flutter/display_list/testing:display_list_testing",
220220
"//flutter/fml",
221+
"//flutter/skia",
221222
"//flutter/testing:skia",
222223
"//flutter/testing:testing_lib",
223224
"//third_party/dart/runtime:libdart_jit", # for tracing
224-
"//third_party/skia",
225225
]
226226
}
227227

‎display_list/testing/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ source_set("display_list_testing") {
1515
]
1616

1717
deps = [
18+
"//flutter/skia",
1819
"//flutter/testing:testing_lib",
19-
"//third_party/skia",
2020
]
2121

2222
public_deps = [ "//flutter/display_list:display_list" ]

‎flow/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ source_set("flow") {
9696
"//flutter/fml",
9797
]
9898

99-
deps = [ "//third_party/skia" ]
99+
deps = [ "//flutter/skia" ]
100100

101101
if (impeller_supports_rendering) {
102102
deps += [
@@ -190,11 +190,11 @@ if (enable_unittests) {
190190
"//flutter/display_list/testing:display_list_testing",
191191
"//flutter/fml",
192192
"//flutter/shell/common:base64",
193+
"//flutter/skia",
193194
"//flutter/testing:skia",
194195
"//flutter/testing:testing_lib",
195196
"//third_party/dart/runtime:libdart_jit", # for tracing
196197
"//third_party/googletest:gtest",
197-
"//third_party/skia",
198198
]
199199

200200
if (!defined(defines)) {

‎flutter_vma/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ source_set("flutter_skia_vma") {
3232
public_deps = [
3333
":flutter_vma",
3434
"//flutter/fml",
35+
"//flutter/skia",
3536
"//flutter/vulkan/procs",
36-
"//third_party/skia",
3737
]
3838
}

‎impeller/display_list/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ impeller_component("skia_conversions") {
1515
"../geometry",
1616
"//flutter/display_list",
1717
"//flutter/fml",
18-
"//third_party/skia",
19-
"//third_party/skia/modules/skparagraph",
18+
"//flutter/skia",
19+
"//flutter/skia/modules/skparagraph",
2020
]
2121
}
2222

@@ -38,7 +38,7 @@ impeller_component("display_list") {
3838
"//flutter/display_list",
3939
"//flutter/fml",
4040
"//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
41-
"//third_party/skia",
41+
"//flutter/skia",
4242
]
4343

4444
if (!defined(defines)) {

‎impeller/image/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impeller_component("image_skia_backend") {
3636

3737
deps = [
3838
"//flutter/fml",
39-
"//third_party/skia",
39+
"//flutter/skia",
4040
]
4141
}
4242

‎impeller/typographer/backends/skia/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ impeller_component("typographer_skia_backend") {
1818

1919
public_deps = [
2020
"//flutter/impeller/typographer",
21-
"//third_party/skia",
21+
"//flutter/skia",
2222
]
2323
}

‎lib/ui/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ source_set("ui") {
163163
"//flutter/flow",
164164
"//flutter/shell/common:display",
165165
"//flutter/shell/common:platform_message_handler",
166+
"//flutter/skia/modules/skparagraph",
166167
"//flutter/third_party/txt",
167-
"//third_party/skia/modules/skparagraph",
168168
]
169169

170170
deps = [
@@ -176,10 +176,10 @@ source_set("ui") {
176176
"//flutter/impeller/runtime_stage",
177177
"//flutter/runtime:dart_plugin_registrant",
178178
"//flutter/runtime:test_font",
179+
"//flutter/skia",
179180
"//flutter/third_party/rapidjson",
180181
"//flutter/third_party/tonic",
181182
"//third_party/dart/runtime/bin:dart_io_api",
182-
"//third_party/skia",
183183
"//third_party/zlib:zlib",
184184
]
185185

‎lib/web_ui/skwasm/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ wasm_lib("skwasm") {
6666
}
6767

6868
deps = [
69-
"//third_party/skia",
70-
"//third_party/skia/modules/skparagraph",
69+
"//flutter/skia",
70+
"//flutter/skia/modules/skparagraph",
7171
]
7272
}

‎runtime/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source_set("test_font") {
1010
"test_font_data.cc",
1111
"test_font_data.h",
1212
]
13-
deps = [ "//third_party/skia" ]
13+
deps = [ "//flutter/skia" ]
1414
public_configs = [ "//flutter:config" ]
1515
defines = []
1616
if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
@@ -106,11 +106,11 @@ source_set("runtime") {
106106
"//flutter/fml",
107107
"//flutter/lib/io",
108108
"//flutter/shell/common:display",
109+
"//flutter/skia",
109110
"//flutter/third_party/tonic",
110111
"//flutter/third_party/txt",
111112
"//third_party/dart/runtime:dart_api",
112113
"//third_party/dart/runtime/bin:dart_io_api",
113-
"//third_party/skia",
114114
]
115115

116116
if (flutter_runtime_mode != "release" && !is_fuchsia) {
@@ -147,12 +147,12 @@ if (enable_unittests) {
147147
"//flutter/common",
148148
"//flutter/fml",
149149
"//flutter/lib/snapshot",
150+
"//flutter/skia",
150151
"//flutter/testing",
151152
"//flutter/testing:dart",
152153
"//flutter/testing:fixture_test",
153154
"//flutter/third_party/tonic",
154155
"//third_party/dart/runtime/bin:elf_loader",
155-
"//third_party/skia",
156156
]
157157
}
158158

‎shell/common/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ source_set("common") {
145145
"//flutter/runtime",
146146
"//flutter/shell/common:base64",
147147
"//flutter/shell/profiling",
148+
"//flutter/skia",
148149
"//third_party/dart/runtime:dart_api",
149-
"//third_party/skia",
150150
]
151151

152152
if (impeller_supports_rendering) {
@@ -256,10 +256,10 @@ if (enable_unittests) {
256256
"//flutter/assets",
257257
"//flutter/common",
258258
"//flutter/lib/ui",
259+
"//flutter/skia",
259260
"//flutter/testing:dart",
260261
"//flutter/testing:fixture_test",
261262
"//flutter/third_party/rapidjson",
262-
"//third_party/skia",
263263
]
264264

265265
public_configs = [

‎shell/gpu/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gpu_common_deps = [
1212
"//flutter/flow",
1313
"//flutter/fml",
1414
"//flutter/shell/common",
15-
"//third_party/skia",
15+
"//flutter/skia",
1616
]
1717

1818
source_set("gpu_surface_software") {

‎shell/platform/android/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source_set("image_generator") {
2929
deps = [
3030
"//flutter/fml",
3131
"//flutter/lib/ui:ui",
32-
"//third_party/skia",
32+
"//flutter/skia",
3333
]
3434

3535
libs = [
@@ -153,8 +153,8 @@ source_set("flutter_shell_native_src") {
153153
"//flutter/shell/platform/android/platform_view_android_delegate",
154154
"//flutter/shell/platform/android/surface",
155155
"//flutter/shell/platform/android/surface:native_window",
156+
"//flutter/skia",
156157
"//flutter/vulkan",
157-
"//third_party/skia",
158158
]
159159

160160
public_configs = [ "//flutter:config" ]

‎shell/platform/android/context/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ source_set("context") {
1616
deps = [
1717
"//flutter/fml",
1818
"//flutter/impeller/renderer",
19-
"//third_party/skia",
19+
"//flutter/skia",
2020
]
2121

2222
if (shell_enable_vulkan) {

‎shell/platform/android/external_view_embedder/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ source_set("external_view_embedder") {
2222
"//flutter/shell/platform/android/context",
2323
"//flutter/shell/platform/android/jni",
2424
"//flutter/shell/platform/android/surface",
25-
"//third_party/skia",
25+
"//flutter/skia",
2626
]
2727
}
2828

‎shell/platform/android/jni/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ source_set("jni") {
1818
"//flutter/fml",
1919
"//flutter/lib/ui",
2020
"//flutter/shell/platform/android/surface:native_window",
21-
"//third_party/skia",
21+
"//flutter/skia",
2222
]
2323
}
2424

‎shell/platform/android/platform_view_android_delegate/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source_set("platform_view_android_delegate") {
1919
"//flutter/lib/ui",
2020
"//flutter/shell/common",
2121
"//flutter/shell/platform/android/jni",
22-
"//third_party/skia",
22+
"//flutter/skia",
2323
]
2424
}
2525

‎shell/platform/android/surface/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source_set("surface") {
2121
"//flutter/shell/common",
2222
"//flutter/shell/platform/android/context",
2323
"//flutter/shell/platform/android/jni",
24-
"//third_party/skia",
24+
"//flutter/skia",
2525
]
2626
}
2727

@@ -35,7 +35,7 @@ source_set("native_window") {
3535

3636
deps = [
3737
"//flutter/fml",
38-
"//third_party/skia",
38+
"//flutter/skia",
3939
]
4040
}
4141

‎shell/platform/darwin/graphics/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ source_set("graphics") {
3636

3737
frameworks = [ "CoreVideo.framework" ]
3838

39-
public_deps = [ "//third_party/skia" ]
39+
public_deps = [ "//flutter/skia" ]
4040

4141
public_configs = [ "//flutter:config" ]
4242
}

‎shell/platform/darwin/ios/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ source_set("flutter_framework_source") {
193193
"//flutter/shell/platform/darwin/common:framework_common",
194194
"//flutter/shell/platform/embedder:embedder_as_internal_library",
195195
"//flutter/shell/profiling:profiling",
196+
"//flutter/skia",
196197
"//flutter/third_party/spring_animation",
197-
"//third_party/skia",
198198
]
199199

200200
public_configs = [
@@ -255,11 +255,11 @@ source_set("ios_test_flutter_mrc") {
255255
"//flutter/shell/common:common",
256256
"//flutter/shell/platform/darwin/common:framework_common",
257257
"//flutter/shell/platform/embedder:embedder_as_internal_library",
258+
"//flutter/skia",
258259
"//flutter/third_party/rapidjson",
259260
"//flutter/third_party/tonic",
260261
"//flutter/third_party/txt",
261262
"//third_party/ocmock:ocmock_shared",
262-
"//third_party/skia",
263263
]
264264

265265
if (shell_enable_vulkan) {
@@ -327,12 +327,12 @@ shared_library("ios_test_flutter") {
327327
"//flutter/shell/platform/darwin/common:framework_common",
328328
"//flutter/shell/platform/embedder:embedder_as_internal_library",
329329
"//flutter/shell/platform/embedder:embedder_test_utils",
330+
"//flutter/skia",
330331
"//flutter/third_party/rapidjson",
331332
"//flutter/third_party/spring_animation",
332333
"//flutter/third_party/tonic",
333334
"//flutter/third_party/txt",
334335
"//third_party/ocmock:ocmock_shared",
335-
"//third_party/skia",
336336
]
337337
public_configs = [
338338
":ios_gpu_configuration_config",

‎shell/platform/darwin/macos/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ source_set("flutter_framework_source") {
125125
"//flutter/shell/platform/darwin/common:framework_common",
126126
"//flutter/shell/platform/darwin/graphics:graphics",
127127
"//flutter/shell/platform/embedder:embedder_as_internal_library",
128-
"//third_party/skia",
128+
"//flutter/skia",
129129
]
130130

131131
public_configs = [ "//flutter:config" ]

‎shell/platform/embedder/BUILD.gn

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ template("embedder_source_set") {
108108
"//flutter/lib/ui",
109109
"//flutter/runtime:libdart",
110110
"//flutter/shell/common",
111+
"//flutter/skia",
111112
"//flutter/third_party/tonic",
112113
"//third_party/dart/runtime/bin:dart_io_api",
113114
"//third_party/dart/runtime/bin:elf_loader",
114-
"//third_party/skia",
115115
]
116116

117117
if (embedder_enable_gl) {
@@ -288,12 +288,12 @@ if (enable_unittests) {
288288
"//flutter/lib/snapshot",
289289
"//flutter/lib/ui",
290290
"//flutter/runtime",
291+
"//flutter/skia",
291292
"//flutter/testing",
292293
"//flutter/testing:dart",
293294
"//flutter/testing:skia",
294295
"//flutter/third_party/tonic",
295296
"//third_party/dart/runtime/bin:elf_loader",
296-
"//third_party/skia",
297297
]
298298

299299
if (test_enable_gl) {
@@ -410,7 +410,7 @@ if (enable_unittests) {
410410
#"//flutter/testing:skia",
411411
#"//flutter/third_party/tonic",
412412
#"//third_party/dart/runtime/bin:elf_loader",
413-
#"//third_party/skia",
413+
#"//flutter/skia",
414414
]
415415
}
416416
}

‎shell/testing/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ executable("testing") {
4040
"//flutter/lib/snapshot",
4141
"//flutter/shell/common",
4242
"//flutter/shell/gpu:gpu_surface_software",
43+
"//flutter/skia",
4344
"//flutter/third_party/tonic",
4445
"//third_party/dart/runtime:libdart_jit",
4546
"//third_party/dart/runtime/bin:dart_io_api",
46-
"//third_party/skia",
4747
]
4848

4949
if (impeller_supports_rendering) {

0 commit comments

Comments
 (0)