Skip to content

Commit b955e15

Browse files
a-sivaa-siva
authored
Manual roll of Dart from 24c7666def...40fd1c456e (flutter#20092)
* Manual roll of Dart from 24c7666def...40fd1c456e dart-lang/sdk@40fd1c456e Revert "[dart:io] Add Abort() on HttpClientRequest" dart-lang/sdk@17d7296a42 [vm/nnbd/bytecode] Fix reuse of type arguments in bytecode dart-lang/sdk@58b6f40c73 Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns. (reland) dart-lang/sdk@fc8a6d9f9b [VM/compiler] Dereference TypeRef literal when propagating constants. dart-lang/sdk@0689ec527a Move "test.dart" (well, most of its contents) into pkg/test_runner. dart-lang/sdk@1094b3c61d Prepare static error test updater tool to handle web tests. dart-lang/sdk@b258585f2f [observatory] Migrate from deprecated isInstanceOf to isA. dart-lang/sdk@dfe1d9b682 Disable OverrideContributor for Cider. dart-lang/sdk@aea99b2f5c scope debug property assist to Diagnosticables dart-lang/sdk@4b96f20a79 [dart:io] Add Abort() on HttpClientRequest dart-lang/sdk@1b1a39708c [build] Use frameworks instead of libs dart-lang/sdk@3fef522496 Revert "Reland "[vm] Replaces fuchsia.deprecatedtimezone"" dart-lang/sdk@8c664d4f3f Revert "Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns." dart-lang/sdk@2efb5bebc7 [ dart:_http ] Fix typo in HTTP response timeline event dart-lang/sdk@0884dae36c Revert "Fix the #include path for ICU headers" dart-lang/sdk@5171534e81 Scope tweaks. Report REFERENCED_BEFORE_DECLARATION in more places. dart-lang/sdk@6bba75079a Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns. dart-lang/sdk@b4ebbb7f5c [build] Update gn to match Fuchsia dart-lang/sdk@cb428a7a02 [dart2js] Remove old bug work around in collector. dart-lang/sdk@08663c20ab Change flutter patch to match existing DEPS on master branch dart-lang/sdk@146ad014d9 update js/meta for the 2.10 dev sdk dart-lang/sdk@488c718793 [co19] Roll co19 to d79951e06e443213243e54c2c32694b79a221b65 dart-lang/sdk@ba20edd7be Add patch for flutter-engine when changing to version 2.10 * Rev buildroot to latest version. * Update license. * update. * Update gn revision. * Format BUILD.gn files as the gn revision has been updated.
1 parent 49a40fa commit b955e15

File tree

69 files changed

+269
-722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+269
-722
lines changed

‎BUILD.gn‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ config("fuchsia_legacy") {
3737

3838
config("export_dynamic_symbols") {
3939
if (is_linux || is_fuchsia) {
40-
inputs = [
41-
"//flutter/common/exported_symbols.sym",
42-
]
40+
inputs = [ "//flutter/common/exported_symbols.sym" ]
4341
ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
4442
}
4543
}
@@ -165,17 +163,13 @@ group("flutter") {
165163
group("dist") {
166164
testonly = true
167165

168-
deps = [
169-
"//flutter/sky/dist",
170-
]
166+
deps = [ "//flutter/sky/dist" ]
171167
}
172168

173169
if (is_fuchsia) {
174170
group("fuchsia_tests") {
175171
testonly = true
176172

177-
deps = [
178-
"//flutter/shell/platform/fuchsia:tests",
179-
]
173+
deps = [ "//flutter/shell/platform/fuchsia:tests" ]
180174
}
181175
}

‎DEPS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ vars = {
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': '24c7666def53832a31559beac130eb3336008110',
37+
'dart_revision': '40fd1c456e0a872ab8f6d2a018b3436d2f7a5f84',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -107,7 +107,7 @@ allowed_hosts = [
107107
]
108108

109109
deps = {
110-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6728d80355083a20ceecb6db1d73c16dee255a43',
110+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '4073a7a300d845597b8b2d553e584d3fd97f70df',
111111

112112
# Fuchsia compatibility
113113
#
@@ -485,7 +485,7 @@ deps = {
485485
'packages': [
486486
{
487487
'package': 'gn/gn/${{platform}}',
488-
'version': 'git_revision:152c5144ceed9592c20f0c8fd55769646077569b'
488+
'version': 'git_revision:1e3fd10c5df6b704fc764ee388149e4f32862823'
489489
},
490490
],
491491
'dep_type': 'cipd',

‎build/dart/rules.gni‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,8 @@ template("dart_pkg") {
163163
dartx_application("${app_name}_dart_app") {
164164
output_name = dartx_output_name
165165
main_dart = rebase_path(app_entrypoint, "", pkg_helper_output_dir)
166-
sources = [
167-
"$root_gen_dir/dart-pkg/${dart_package_name}.stamp",
168-
]
169-
deps = [
170-
":$dart_pkg_target_name",
171-
]
166+
sources = [ "$root_gen_dir/dart-pkg/${dart_package_name}.stamp" ]
167+
deps = [ ":$dart_pkg_target_name" ]
172168
deps += invoker.deps
173169
if (defined(invoker.strict)) {
174170
strict = invoker.strict
@@ -178,9 +174,7 @@ template("dart_pkg") {
178174
}
179175

180176
group(target_name) {
181-
public_deps = [
182-
":$dart_pkg_target_name",
183-
]
177+
public_deps = [ ":$dart_pkg_target_name" ]
184178
if (defined(invoker.apps)) {
185179
foreach(app, invoker.apps) {
186180
app_name = app[0]

‎build/zip_bundle.gni‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ template("zip_bundle") {
3737
assert(defined(invoker.files), "files must be defined as a list of scopes")
3838
action(target_name) {
3939
script = "//flutter/build/zip.py"
40-
outputs = [
41-
"$root_build_dir/zip_archives/${invoker.output}",
42-
]
40+
outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ]
4341
inputs = []
4442
deps = invoker.deps
4543

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: ace4b50b35dcf1f0615ef82b87950698
1+
Signature: 97a28766592ed592458b78e7da5d05fd
22

33
UNUSED LICENSES:
44

‎common/BUILD.gn‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ source_set("common") {
1616
"task_runners.h",
1717
]
1818

19-
deps = [
20-
"//flutter/fml",
21-
]
19+
deps = [ "//flutter/fml" ]
2220

2321
public_configs = [
2422
":flutter_config",

‎flow/BUILD.gn‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,18 @@ if (enable_unittests) {
183183
executable("flow_unittests") {
184184
testonly = true
185185

186-
deps = [
187-
":flow_unittests_common_fuchsia_legacy",
188-
]
186+
deps = [ ":flow_unittests_common_fuchsia_legacy" ]
189187
}
190188
executable("flow_unittests_next") {
191189
testonly = true
192190

193-
deps = [
194-
":flow_unittests_common",
195-
]
191+
deps = [ ":flow_unittests_common" ]
196192
}
197193
} else {
198194
executable("flow_unittests") {
199195
testonly = true
200196

201-
deps = [
202-
":flow_unittests_common",
203-
]
197+
deps = [ ":flow_unittests_common" ]
204198
}
205199
}
206200
}

‎flutter_frontend_server/BUILD.gn‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ frontend_server_files +=
2222

2323
application_snapshot("frontend_server") {
2424
main_dart = "bin/starter.dart"
25-
deps = [
26-
"//flutter/lib/snapshot:kernel_platform_files",
27-
]
25+
deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]
2826
dot_packages = rebase_path(".dart_tool/package_config.json")
2927
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
3028
training_args = [

‎fml/BUILD.gn‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ if (enable_unittests) {
230230
executable("fml_benchmarks") {
231231
testonly = true
232232

233-
sources = [
234-
"message_loop_task_queues_benchmark.cc",
235-
]
233+
sources = [ "message_loop_task_queues_benchmark.cc" ]
236234

237235
deps = [
238236
"//flutter/benchmarking",

‎lib/snapshot/BUILD.gn‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ copy("generate_dart_ui") {
1414
visibility = [ ":*" ]
1515
sources = dart_ui_files
1616

17-
outputs = [
18-
"$bindings_output_dir/dart_ui/{{source_file_part}}",
19-
]
17+
outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ]
2018
}
2119

2220
compiled_action("generate_snapshot_bin") {
@@ -32,12 +30,8 @@ compiled_action("generate_snapshot_bin") {
3230

3331
platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
3432

35-
inputs = [
36-
platform_kernel,
37-
]
38-
deps = [
39-
":kernel_platform_files",
40-
]
33+
inputs = [ platform_kernel ]
34+
deps = [ ":kernel_platform_files" ]
4135

4236
vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin"
4337
vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
@@ -109,9 +103,7 @@ template("bin_to_assembly") {
109103
script,
110104
invoker.input,
111105
]
112-
outputs = [
113-
output,
114-
]
106+
outputs = [ output ]
115107
}
116108
}
117109

@@ -150,12 +142,8 @@ template("bin_to_coff") {
150142
if (current_cpu == "x64") {
151143
args += [ "--64-bit" ]
152144
}
153-
inputs = [
154-
invoker.input,
155-
]
156-
outputs = [
157-
output,
158-
]
145+
inputs = [ invoker.input ]
146+
outputs = [ output ]
159147
}
160148
}
161149

@@ -174,45 +162,35 @@ template("bin_to_linkable") {
174162
}
175163

176164
bin_to_linkable("vm_snapshot_data_linkable") {
177-
deps = [
178-
":generate_snapshot_bin",
179-
]
165+
deps = [ ":generate_snapshot_bin" ]
180166
input = "$target_gen_dir/vm_isolate_snapshot.bin"
181167
symbol = "kDartVmSnapshotData"
182168
executable = false
183169
}
184170

185171
bin_to_linkable("vm_snapshot_instructions_linkable") {
186-
deps = [
187-
":generate_snapshot_bin",
188-
]
172+
deps = [ ":generate_snapshot_bin" ]
189173
input = "$target_gen_dir/vm_snapshot_instructions.bin"
190174
symbol = "kDartVmSnapshotInstructions"
191175
executable = true
192176
}
193177

194178
bin_to_linkable("isolate_snapshot_data_linkable") {
195-
deps = [
196-
":generate_snapshot_bin",
197-
]
179+
deps = [ ":generate_snapshot_bin" ]
198180
input = "$target_gen_dir/isolate_snapshot.bin"
199181
symbol = "kDartIsolateSnapshotData"
200182
executable = false
201183
}
202184

203185
bin_to_linkable("isolate_snapshot_instructions_linkable") {
204-
deps = [
205-
":generate_snapshot_bin",
206-
]
186+
deps = [ ":generate_snapshot_bin" ]
207187
input = "$target_gen_dir/isolate_snapshot_instructions.bin"
208188
symbol = "kDartIsolateSnapshotInstructions"
209189
executable = true
210190
}
211191

212192
bin_to_linkable("platform_strong_dill_linkable") {
213-
deps = [
214-
":kernel_platform_files",
215-
]
193+
deps = [ ":kernel_platform_files" ]
216194
input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
217195
symbol = "kPlatformStrongDill"
218196
size_symbol = "kPlatformStrongDillSize"
@@ -261,7 +239,5 @@ compile_platform("strong_platform") {
261239

262240
# Fuchsia's snapshot requires a different platform with extra dart: libraries.
263241
group("kernel_platform_files") {
264-
public_deps = [
265-
":strong_platform",
266-
]
242+
public_deps = [ ":strong_platform" ]
267243
}

0 commit comments

Comments
 (0)