Skip to content

Commit

Permalink
Revert "Manual roll Dart SDK from 2d98d9e27dae to 0b07debd5862 (21 re…
Browse files Browse the repository at this point in the history
…visions) (#43457)" (#43466)

This reverts commit a109e0b as it breaks flutter framework tests during subsequent roll.

From flutter/flutter#130138:

_TypeError: (#0      _ProgramInfoBuilder.createInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:450:53))
```
#0      _ProgramInfoBuilder.createInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:450:53)
#1      _ProgramInfoBuilder.getInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:374:14)
#2      _ProgramInfoBuilder.createInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:444:23)
#3      _ProgramInfoBuilder.getInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:374:14)
#4      _ProgramInfoBuilder.createInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:419:54)
#5      _ProgramInfoBuilder.getInfoNodeFor (package:vm_snapshot_analysis/v8_profile.dart:374:14)
#6      ListIterable.forEach (dart:_internal/iterable.dart:39:13)
#7      _ProgramInfoBuilder.build (package:vm_snapshot_analysis/v8_profile.dart:338:16)
#8      toProgramInfo (package:vm_snapshot_analysis/v8_profile.dart:282:8)
#9      _treemapFromSnapshot (package:vm_snapshot_analysis/treemap.dart:158:27)
#10     treemapFromJson (package:vm_snapshot_analysis/treemap.dart:85:5)
#11     SizeAnalyzer.analyzeZipSizeAndAotSnapshot (package:flutter_tools/src/base/analyze_size.dart:123:59)
#12     AndroidGradleBuilder._performCodeSizeAnalysis (package:flutter_tools/src/android/gradle.dart:623:60)
#13     AndroidGradleBuilder.buildGradleApp (package:flutter_tools/src/android/gradle.dart:604:15)
<asynchronous suspension>
#14     AndroidGradleBuilder.buildApk (package:flutter_tools/src/android/gradle.dart:242:5)
<asynchronous suspension>
#15     BuildApkCommand.runCommand (package:flutter_tools/src/commands/build_apk.dart:116:5)
<asynchronous suspension>
#16     FlutterCommand.run.<anonymous closure> (package:flutter_tools/src/runner/flutter_command.dart:1297:27)
<asynchronous suspension>
#17     AppContext.run.<anonymous closure> (package:flutter_tools/src/base/context.dart:150:19)
<asynchronous suspension>
#18     CommandRunner.runCommand (package:args/command_runner.dart:212:13)
<asynchronous suspension>
```
  • Loading branch information
aam authored Jul 7, 2023
1 parent 942909b commit 5ae09b8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '0b07debd58622778d39cd2684c8e45f32234ad0e',
'dart_revision': '2d98d9e27daeb80dd6ddb6da94ea9f1a4fe7e5ca',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -67,7 +67,7 @@ vars = {
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
'dart_protobuf_rev': '7bebbc67f724cfd166b9dcd6bd547ee936bd8e40',
'dart_protobuf_rev': 'e76bd74e5c99b47c12b523b49140b637225fc3fc',
'dart_pub_rev': '42819a1e10f803eb7f6296692c5a976e1c647360',
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
'dart_tools_rev': '8db0aa1e8c418289b9a972529b0f47902c559550',
Expand Down Expand Up @@ -371,7 +371,7 @@ deps = {
Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',

'src/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@c2ed703c9b4619f9a010bce5767178fb7792dcdc',
Var('dart_git') + '/dartdoc.git@e04a6b309a28498e9221ea45c878beae2aaa7dac',

'src/third_party/dart/third_party/pkg/ffi':
Var('dart_git') + '/ffi.git@f582ca022042323af061f35ccd24b6c4d38f7bd1',
Expand All @@ -389,7 +389,7 @@ deps = {
Var('dart_git') + '/html.git@b3b820bc36ed17673268360d8b569bdc66c22123',

'src/third_party/dart/third_party/pkg/http':
Var('dart_git') + '/http.git@d68081f50f0f0a8928e42237e937dcc69cc5d890',
Var('dart_git') + '/http.git@ff1fcfe5d77ea09b82a0aff0d796018504aef59b',

'src/third_party/dart/third_party/pkg/http_multi_server':
Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2',
Expand All @@ -413,7 +413,7 @@ deps = {
Var('dart_git') + '/logging.git@f2fe2ac2a61a269b2e0ce65be330f7af1bc67428',

'src/third_party/dart/third_party/pkg/markdown':
Var('dart_git') + '/markdown.git@4674d095786a40643d3506d6483eb11d26c2eb6e',
Var('dart_git') + '/markdown.git@bd6ae8d741327e24319f3e036d57107f91229843',

'src/third_party/dart/third_party/pkg/matcher':
Var('dart_git') + '/matcher.git@7e1011772566a8d1817c725a71f091e2791721c8',
Expand All @@ -422,7 +422,7 @@ deps = {
Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4',

'src/third_party/dart/third_party/pkg/mockito':
Var('dart_git') + '/mockito.git@974226e250cebaf7458817fb931f4f4585e76d5e',
Var('dart_git') + '/mockito.git@1d6064adf043d1fce013d2d205a3fdc655c90043',

'src/third_party/dart/third_party/pkg/native':
Var('dart_git') + '/native.git@e12d3e6ebe7ec3143566e9f1d48876a762602e24',
Expand Down Expand Up @@ -473,7 +473,7 @@ deps = {
Var('dart_git') + '/term_glyph.git@4daa34eea4bd6d9780aaeadbf6665af3ebb402fd',

'src/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@021667a403e560f19f6d91043fee5dc723b381fd',
Var('dart_git') + '/test.git@cdc8178b885e80930d5141ff48daae3af5525ba7',

'src/third_party/dart/third_party/pkg/test_reflective_loader':
Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502',
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 7855eb2efd94741433f0382f1729425f
Signature: ae49655b4bf3dbf9660befcbd03106f5

====================================================================================================
LIBRARY: angle
Expand Down

0 comments on commit 5ae09b8

Please sign in to comment.