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

Commit 64d5af2

Browse files
zandersozanderso
authored
Don't use Skia BUILD.gn files (#47677)
The new `BUILD.gn` files in the Engine tree can't go under `build/secondary` because Skia still has its own, and they'd be selected first. So, this PR puts the new `BUILD.gn` files under `flutter/skia`.
1 parent be43db3 commit 64d5af2

37 files changed

Lines changed: 1323 additions & 55 deletions

File tree

‎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
}

0 commit comments

Comments
 (0)