Skip to content

Commit 37c44d7

Browse files
rmacnak-googlecamsim99
authored andcommitted
Remove use of deprecated copy_trees. (#187091)
1 parent 527ebc7 commit 37c44d7

5 files changed

Lines changed: 19 additions & 34 deletions

File tree

engine/src/flutter/build/dart/BUILD.gn

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,9 @@ import("$dart_src/build/dart/copy_tree.gni")
99

1010
if (build_engine_artifacts) {
1111
if (flutter_prebuilt_dart_sdk) {
12-
copy_trees("_copy_trees") {
13-
sources = [
14-
{
15-
target = "copy_dart_sdk"
16-
visibility = [ ":dart_sdk" ]
17-
source = prebuilt_dart_sdk
18-
dest = "$root_out_dir/dart-sdk"
19-
ignore_patterns = "{}"
20-
},
21-
]
22-
}
23-
group("dart_sdk") {
24-
public_deps = [ ":copy_dart_sdk" ]
12+
copy_tree("dart_sdk") {
13+
source = prebuilt_dart_sdk
14+
dest = "$root_out_dir/dart-sdk"
2515
}
2616
} else {
2717
group("dart_sdk") {

engine/src/flutter/ci/builders/linux_host_engine_test.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"config": "ci/host_debug_test",
3232
"targets": [
3333
"flutter:unittests",
34-
"flutter/build/dart:copy_dart_sdk",
34+
"flutter/build/dart:dart_sdk",
3535
"flutter/shell/testing",
3636
"flutter/tools/path_ops"
3737
]
@@ -78,7 +78,7 @@
7878
"config": "ci/host_profile_test",
7979
"targets": [
8080
"flutter:unittests",
81-
"flutter/build/dart:copy_dart_sdk",
81+
"flutter/build/dart:dart_sdk",
8282
"flutter/shell/testing",
8383
"flutter/tools/path_ops"
8484
]
@@ -131,7 +131,7 @@
131131
"config": "ci/host_release_test",
132132
"targets": [
133133
"flutter:unittests",
134-
"flutter/build/dart:copy_dart_sdk",
134+
"flutter/build/dart:dart_sdk",
135135
"flutter/display_list:display_list_benchmarks",
136136
"flutter/display_list:display_list_builder_benchmarks",
137137
"flutter/display_list:display_list_region_benchmarks",

engine/src/flutter/ci/builders/linux_unopt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"targets": [
2929
"flutter/tools/font_subset",
3030
"flutter:unittests",
31-
"flutter/build/dart:copy_dart_sdk",
31+
"flutter/build/dart:dart_sdk",
3232
"flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
3333
"flutter/shell/platform/common:common_cpp_core_unittests",
3434
"flutter/shell/platform/common:common_cpp_unittests",

engine/src/flutter/ci/builders/standalone/linux_benchmarks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ninja": {
2424
"config": "ci/host_release_benchmarks",
2525
"targets": [
26-
"flutter/build/dart:copy_dart_sdk",
26+
"flutter/build/dart:dart_sdk",
2727
"flutter/display_list:display_list_benchmarks",
2828
"flutter/display_list:display_list_builder_benchmarks",
2929
"flutter/display_list:display_list_region_benchmarks",

engine/src/flutter/testing/ios_scenario_app/ios/BUILD.gn

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,17 @@ copy("copy_info_plist") {
3939
outputs = [ "$_app_framework_dir/Info.plist" ]
4040
}
4141

42-
copy_trees("scenario_ios") {
43-
sources = [
44-
{
45-
target = "copy_ios_xcodeproj"
46-
visibility = [ ":*" ]
47-
source = "."
48-
dest = "$root_out_dir/ios_scenario_app"
49-
50-
# Ignore any stale App.framework or Flutter.xcframework files from
51-
# historical builds.
52-
# This can eventually be set to "{}" when all CI builder caches have been
53-
# flushed that might still have these stale gitignored files from previous
54-
# build scripts.
55-
ignore_patterns = "*.*framework"
56-
},
57-
]
42+
copy_tree("copy_ios_xcodeproj") {
43+
visibility = [ ":*" ]
44+
source = "."
45+
dest = "$root_out_dir/ios_scenario_app"
46+
47+
# Ignore any stale App.framework or Flutter.xcframework files from
48+
# historical builds.
49+
# This can eventually be set to "{}" when all CI builder caches have been
50+
# flushed that might still have these stale gitignored files from previous
51+
# build scripts.
52+
exclude = "*.*framework"
5853
}
5954

6055
group("ios") {

0 commit comments

Comments
 (0)