Skip to content

Commit ee0cf82

Browse files
author
Jonah Williams
authored
Correct libraries.yaml path for stub_ui, add brightness, copy dart2js_platform.dill files (flutter#7725)
1 parent 053f7a8 commit ee0cf82

File tree

5 files changed

+121
-95
lines changed

5 files changed

+121
-95
lines changed

‎BUILD.gn

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ group("flutter") {
3636
"$flutter_root/frontend_server",
3737
"//third_party/dart:create_sdk",
3838
"$flutter_root/lib/stub_ui:stub_ui",
39+
":dart2js_platform_files"
3940
]
4041
foreach(snapshot, _flutter_sdk_snapshots) {
4142
public_deps += [ ":copy_flutter_${snapshot[0]}_snapshot" ]
@@ -91,3 +92,18 @@ foreach(snapshot, _flutter_sdk_snapshots) {
9192
]
9293
}
9394
}
95+
96+
copy("dart2js_platform_files") {
97+
deps = [
98+
"//third_party/dart/utils/compiler:compile_dart2js_platform"
99+
]
100+
101+
sources = [
102+
"$root_out_dir/dart2js_outline.dill",
103+
"$root_out_dir/dart2js_platform.dill",
104+
]
105+
106+
outputs = [
107+
"$root_out_dir/flutter_patched_sdk/{{source_file_part}}",
108+
]
109+
}

‎lib/stub_ui/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ copy("stub_ui") {
2222
]
2323

2424
deps = [
25-
":stub_libraries"
25+
":stub_libraries",
2626
]
2727

2828
outputs = [

‎lib/stub_ui/libraries.json

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,118 @@
44
"dart2js": {
55
"libraries": {
66
"async": {
7-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart",
8-
"uri": "../../dart-sdk/lib/async/async.dart"
7+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart",
8+
"uri": "../../../../dart-sdk/lib/async/async.dart"
99
},
1010
"_interceptors": {
11-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart"
11+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart"
1212
},
1313
"mirrors": {
14-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart",
14+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart",
1515
"supported": false,
16-
"uri": "../../dart-sdk/lib/mirrors/mirrors.dart"
16+
"uri": "../../../../dart-sdk/lib/mirrors/mirrors.dart"
1717
},
1818
"_js_embedded_names": {
19-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
19+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
2020
},
2121
"io": {
22-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart",
22+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart",
2323
"supported": false,
24-
"uri": "../../dart-sdk/lib/io/io.dart"
24+
"uri": "../../../../dart-sdk/lib/io/io.dart"
2525
},
2626
"_internal": {
27-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart",
28-
"uri": "../../dart-sdk/lib/internal/internal.dart"
27+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart",
28+
"uri": "../../../../dart-sdk/lib/internal/internal.dart"
2929
},
3030
"_metadata": {
31-
"uri": "../../dart-sdk/lib/html/html_common/metadata.dart"
31+
"uri": "../../../../dart-sdk/lib/html/html_common/metadata.dart"
3232
},
3333
"_async_await_error_codes": {
34-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
34+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
3535
},
3636
"_http": {
37-
"uri": "../../dart-sdk/lib/_http/http.dart"
37+
"uri": "../../../../dart-sdk/lib/_http/http.dart"
3838
},
3939
"_js_primitives": {
40-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
40+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
4141
},
4242
"_js_helper": {
43-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart"
43+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart"
4444
},
4545
"_chrome": {
46-
"uri": "../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart"
46+
"uri": "../../../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart"
4747
},
4848
"html_common": {
49-
"uri": "../../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
49+
"uri": "../../../../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
5050
},
5151
"ui": {
5252
"uri": "stub_ui/ui.dart"
5353
},
5454
"js": {
55-
"uri": "../../dart-sdk/lib/js/dart2js/js_dart2js.dart"
55+
"uri": "../../../../dart-sdk/lib/js/dart2js/js_dart2js.dart"
5656
},
5757
"_native_typed_data": {
58-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
58+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
5959
},
6060
"_js_names": {
61-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart"
61+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart"
6262
},
6363
"core": {
64-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart",
65-
"uri": "../../dart-sdk/lib/core/core.dart"
64+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart",
65+
"uri": "../../../../dart-sdk/lib/core/core.dart"
6666
},
6767
"collection": {
68-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart",
69-
"uri": "../../dart-sdk/lib/collection/collection.dart"
68+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart",
69+
"uri": "../../../../dart-sdk/lib/collection/collection.dart"
7070
},
7171
"js_util": {
72-
"uri": "../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart"
72+
"uri": "../../../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart"
7373
},
7474
"typed_data": {
75-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart",
76-
"uri": "../../dart-sdk/lib/typed_data/typed_data.dart"
75+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart",
76+
"uri": "../../../../dart-sdk/lib/typed_data/typed_data.dart"
7777
},
7878
"web_audio": {
79-
"uri": "../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
79+
"uri": "../../../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
8080
},
8181
"html": {
82-
"uri": "../../dart-sdk/lib/html/dart2js/html_dart2js.dart"
82+
"uri": "../../../../dart-sdk/lib/html/dart2js/html_dart2js.dart"
8383
},
8484
"isolate": {
85-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart",
85+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart",
8686
"supported": false,
87-
"uri": "../../dart-sdk/lib/isolate/isolate.dart"
87+
"uri": "../../../../dart-sdk/lib/isolate/isolate.dart"
8888
},
8989
"developer": {
90-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart",
91-
"uri": "../../dart-sdk/lib/developer/developer.dart"
90+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart",
91+
"uri": "../../../../dart-sdk/lib/developer/developer.dart"
9292
},
9393
"web_gl": {
94-
"uri": "../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
94+
"uri": "../../../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
9595
},
9696
"indexed_db": {
97-
"uri": "../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
97+
"uri": "../../../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
9898
},
9999
"_js": {
100-
"patches": "../../dart-sdk/lib/js/_js_client.dart",
101-
"uri": "../../dart-sdk/lib/js/_js.dart"
100+
"patches": "../../../../dart-sdk/lib/js/_js_client.dart",
101+
"uri": "../../../../dart-sdk/lib/js/_js.dart"
102102
},
103103
"convert": {
104-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart",
105-
"uri": "../../dart-sdk/lib/convert/convert.dart"
104+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart",
105+
"uri": "../../../../dart-sdk/lib/convert/convert.dart"
106106
},
107107
"math": {
108-
"patches": "../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart",
109-
"uri": "../../dart-sdk/lib/math/math.dart"
108+
"patches": "../../../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart",
109+
"uri": "../../../../dart-sdk/lib/math/math.dart"
110110
},
111111
"_foreign_helper": {
112-
"uri": "../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
112+
"uri": "../../../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
113113
},
114114
"web_sql": {
115-
"uri": "../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
115+
"uri": "../../../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
116116
},
117117
"svg": {
118-
"uri": "../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
118+
"uri": "../../../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
119119
}
120120
}
121121
}

‎lib/stub_ui/libraries.yaml

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
1+
# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

@@ -11,123 +11,118 @@
1111
# changing libraries, sources, and patch files. See
1212
# https://github.com/dart-lang/sdk/issues/28836.
1313

14-
# These paths are relative to the source location in the flutter cache under
15-
# the flutter_patched_sdk
16-
# bin/cache/
17-
# dart-sdk/
18-
# engine/common/flutter_patched_sdk
1914
dart2js:
2015
libraries:
2116
ui:
2217
uri: "stub_ui/ui.dart"
2318

2419
async:
25-
uri: "../../dart-sdk/lib/async/async.dart"
26-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart"
20+
uri: "../../../../dart-sdk/lib/async/async.dart"
21+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/async_patch.dart"
2722

2823
_chrome:
29-
uri: "../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart"
24+
uri: "../../../../dart-sdk/lib/_chrome/dart2js/chrome_dart2js.dart"
3025

3126
collection:
32-
uri: "../../dart-sdk/lib/collection/collection.dart"
33-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
27+
uri: "../../../../dart-sdk/lib/collection/collection.dart"
28+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
3429

3530
convert:
36-
uri: "../../dart-sdk/lib/convert/convert.dart"
37-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
31+
uri: "../../../../dart-sdk/lib/convert/convert.dart"
32+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
3833

3934
core:
40-
uri: "../../dart-sdk/lib/core/core.dart"
41-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart"
35+
uri: "../../../../dart-sdk/lib/core/core.dart"
36+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/core_patch.dart"
4237

4338
developer:
44-
uri: "../../dart-sdk/lib/developer/developer.dart"
45-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
39+
uri: "../../../../dart-sdk/lib/developer/developer.dart"
40+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
4641

4742
html:
48-
uri: "../../dart-sdk/lib/html/dart2js/html_dart2js.dart"
43+
uri: "../../../../dart-sdk/lib/html/dart2js/html_dart2js.dart"
4944

5045
html_common:
51-
uri: "../../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
46+
uri: "../../../../dart-sdk/lib/html/html_common/html_common_dart2js.dart"
5247

5348
indexed_db:
54-
uri: "../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
49+
uri: "../../../../dart-sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
5550

5651
_http:
57-
uri: "../../dart-sdk/lib/_http/http.dart"
52+
uri: "../../../../dart-sdk/lib/_http/http.dart"
5853

5954
io:
60-
uri: "../../dart-sdk/lib/io/io.dart"
61-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart"
55+
uri: "../../../../dart-sdk/lib/io/io.dart"
56+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/io_patch.dart"
6257
supported: false
6358

6459
isolate:
65-
uri: "../../dart-sdk/lib/isolate/isolate.dart"
66-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart"
60+
uri: "../../../../dart-sdk/lib/isolate/isolate.dart"
61+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/isolate_patch.dart"
6762
supported: false
6863

6964
js:
70-
uri: "../../dart-sdk/lib/js/dart2js/js_dart2js.dart"
65+
uri: "../../../../dart-sdk/lib/js/dart2js/js_dart2js.dart"
7166

7267
_js:
73-
uri: "../../dart-sdk/lib/js/_js.dart"
74-
patches: "../../dart-sdk/lib/js/_js_client.dart"
68+
uri: "../../../../dart-sdk/lib/js/_js.dart"
69+
patches: "../../../../dart-sdk/lib/js/_js_client.dart"
7570

7671
js_util:
77-
uri: "../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart"
72+
uri: "../../../../dart-sdk/lib/js_util/dart2js/js_util_dart2js.dart"
7873

7974
math:
80-
uri: "../../dart-sdk/lib/math/math.dart"
81-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart"
75+
uri: "../../../../dart-sdk/lib/math/math.dart"
76+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/math_patch.dart"
8277

8378
mirrors:
84-
uri: "../../dart-sdk/lib/mirrors/mirrors.dart"
85-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart"
79+
uri: "../../../../dart-sdk/lib/mirrors/mirrors.dart"
80+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/mirrors_patch_cfe.dart"
8681
supported: false
8782

8883
typed_data:
89-
uri: "../../dart-sdk/lib/typed_data/typed_data.dart"
90-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart"
84+
uri: "../../../../dart-sdk/lib/typed_data/typed_data.dart"
85+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart"
9186

9287
_native_typed_data:
93-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
88+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
9489

9590
svg:
96-
uri: "../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
91+
uri: "../../../../dart-sdk/lib/svg/dart2js/svg_dart2js.dart"
9792

9893
web_audio:
99-
uri: "../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
94+
uri: "../../../../dart-sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
10095

10196
web_gl:
102-
uri: "../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
97+
uri: "../../../../dart-sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
10398

10499
web_sql:
105-
uri: "../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
100+
uri: "../../../../dart-sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
106101

107102
_internal:
108-
uri: "../../dart-sdk/lib/internal/internal.dart"
109-
patches: "../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
103+
uri: "../../../../dart-sdk/lib/internal/internal.dart"
104+
patches: "../../../../dart-sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
110105

111106
_js_helper:
112-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart"
107+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_helper.dart"
113108

114109
_interceptors:
115-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart"
110+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/interceptors.dart"
116111

117112
_foreign_helper:
118-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
113+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
119114

120115
_js_names:
121-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart"
116+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_names.dart"
122117

123118
_js_primitives:
124-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
119+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
125120

126121
_js_embedded_names:
127-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
122+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
128123

129124
_async_await_error_codes:
130-
uri: "../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
125+
uri: "../../../../dart-sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
131126

132127
_metadata:
133-
uri: "../../dart-sdk/lib/html/html_common/metadata.dart"
128+
uri: "../../../../dart-sdk/lib/html/html_common/metadata.dart"

‎lib/stub_ui/window.dart

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,21 @@ class AccessibilityFeatures {
909909
int get hashCode => _index.hashCode;
910910
}
911911

912+
/// Describes the contrast of a theme or color palette.
913+
enum Brightness {
914+
/// The color is dark and will require a light text color to achieve readable
915+
/// contrast.
916+
///
917+
/// For example, the color might be dark grey, requiring white text.
918+
dark,
919+
920+
/// The color is light and will require a dark text color to achieve readable
921+
/// contrast.
922+
///
923+
/// For example, the color might be bright white, requiring black text.
924+
light,
925+
}
926+
912927
/// The [Window] singleton. This object exposes the size of the display, the
913928
/// core scheduler API, the input event callback, the graphics drawing API, and
914929
/// other such core services.

0 commit comments

Comments
 (0)