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

Commit de90dbf

Browse files
Refactor web configuration/ Add dartdevc (#7978)
1 parent ff46dd3 commit de90dbf

File tree

11 files changed

+560
-526
lines changed

11 files changed

+560
-526
lines changed

BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# found in the LICENSE file.
44

55
import("$flutter_root/common/config.gni")
6-
import("//third_party/dart/build/dart/dart_action.gni")
76

87
group("flutter") {
98
testonly = true
@@ -24,7 +23,7 @@ group("flutter") {
2423
public_deps += [
2524
"$flutter_root/frontend_server",
2625
"//third_party/dart:create_sdk",
27-
"$flutter_root/lib/stub_ui:stub_ui",
26+
"$flutter_root/web_sdk",
2827
]
2928
}
3029
}

ci/licenses_golden/licenses_flutter

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ FILE: ../../../flutter/lib/stub_ui/hash_codes.dart
251251
FILE: ../../../flutter/lib/stub_ui/hooks.dart
252252
FILE: ../../../flutter/lib/stub_ui/isolate_name_server.dart
253253
FILE: ../../../flutter/lib/stub_ui/lerp.dart
254-
FILE: ../../../flutter/lib/stub_ui/libraries.json
255254
FILE: ../../../flutter/lib/stub_ui/natives.dart
256255
FILE: ../../../flutter/lib/stub_ui/painting.dart
257256
FILE: ../../../flutter/lib/stub_ui/plugins.dart
@@ -704,6 +703,7 @@ FILE: ../../../flutter/vulkan/vulkan_utilities.cc
704703
FILE: ../../../flutter/vulkan/vulkan_utilities.h
705704
FILE: ../../../flutter/vulkan/vulkan_window.cc
706705
FILE: ../../../flutter/vulkan/vulkan_window.h
706+
FILE: ../../../flutter/web_sdk/libraries.json
707707
----------------------------------------------------------------------------------------------------
708708
Copyright 2013 The Flutter Authors. All rights reserved.
709709

lib/snapshot/libraries.json

Lines changed: 0 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,6 @@
11
{
22
"comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.",
33
"comment:1": "Instead modify 'flutter/lib/snapshot/libraries.yaml' and follow the instructions therein.",
4-
"none": {
5-
"libraries": {}
6-
},
7-
"dartdevc": {
8-
"libraries": {
9-
"async": {
10-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart",
11-
"uri": "../../../third_party/dart/sdk/lib/async/async.dart"
12-
},
13-
"_runtime": {
14-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"
15-
},
16-
"_interceptors": {
17-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"
18-
},
19-
"mirrors": {
20-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart",
21-
"supported": false,
22-
"uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
23-
},
24-
"_debugger": {
25-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart"
26-
},
27-
"io": {
28-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart",
29-
"supported": false,
30-
"uri": "../../../third_party/dart/sdk/lib/io/io.dart"
31-
},
32-
"_internal": {
33-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart",
34-
"uri": "../../../third_party/dart/sdk/lib/internal/internal.dart"
35-
},
36-
"_metadata": {
37-
"uri": "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart"
38-
},
39-
"_http": {
40-
"uri": "../../../third_party/dart/sdk/lib/_http/http.dart"
41-
},
42-
"_js_primitives": {
43-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"
44-
},
45-
"_js_helper": {
46-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"
47-
},
48-
"ui": {
49-
"uri": "flutter/lib/stub_ui/ui.dart"
50-
},
51-
"js": {
52-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"
53-
},
54-
"_js_mirrors": {
55-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"
56-
},
57-
"html_common": {
58-
"uri": "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"
59-
},
60-
"_native_typed_data": {
61-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"
62-
},
63-
"core": {
64-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart",
65-
"uri": "../../../third_party/dart/sdk/lib/core/core.dart"
66-
},
67-
"js_util": {
68-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"
69-
},
70-
"collection": {
71-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart",
72-
"uri": "../../../third_party/dart/sdk/lib/collection/collection.dart"
73-
},
74-
"typed_data": {
75-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart",
76-
"uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
77-
},
78-
"web_audio": {
79-
"uri": "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
80-
},
81-
"html": {
82-
"uri": "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"
83-
},
84-
"developer": {
85-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart",
86-
"uri": "../../../third_party/dart/sdk/lib/developer/developer.dart"
87-
},
88-
"isolate": {
89-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart",
90-
"supported": false,
91-
"uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
92-
},
93-
"web_gl": {
94-
"uri": "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
95-
},
96-
"indexed_db": {
97-
"uri": "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
98-
},
99-
"convert": {
100-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart",
101-
"uri": "../../../third_party/dart/sdk/lib/convert/convert.dart"
102-
},
103-
"_isolate_helper": {
104-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"
105-
},
106-
"math": {
107-
"patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart",
108-
"uri": "../../../third_party/dart/sdk/lib/math/math.dart"
109-
},
110-
"_foreign_helper": {
111-
"uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"
112-
},
113-
"web_sql": {
114-
"uri": "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
115-
},
116-
"svg": {
117-
"uri": "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"
118-
}
119-
}
120-
},
1214
"flutter": {
1225
"libraries": {
1236
"_builtin": {

lib/snapshot/libraries.yaml

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
# changing libraries, sources, and patch files. See
1212
# https://github.com/dart-lang/sdk/issues/28836.
1313

14-
none:
15-
libraries: {}
16-
1714
flutter:
1815
libraries:
1916
_builtin:
@@ -150,115 +147,3 @@ flutter:
150147

151148
vmservice_io:
152149
uri: "../../../third_party/dart/runtime/bin/vmservice/vmservice_io.dart"
153-
154-
dartdevc:
155-
libraries:
156-
_runtime:
157-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart"
158-
159-
_debugger:
160-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart"
161-
162-
_foreign_helper:
163-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart"
164-
165-
_http:
166-
uri: "../../../third_party/dart/sdk/lib/_http/http.dart"
167-
168-
_interceptors:
169-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart"
170-
171-
_internal:
172-
uri: "../../../third_party/dart/sdk/lib/internal/internal.dart"
173-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart"
174-
175-
_isolate_helper:
176-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart"
177-
178-
_js_helper:
179-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart"
180-
181-
_js_mirrors:
182-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart"
183-
184-
_js_primitives:
185-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart"
186-
187-
_metadata:
188-
uri: "../../../third_party/dart/sdk/lib/html/html_common/metadata.dart"
189-
190-
_native_typed_data:
191-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart"
192-
193-
async:
194-
uri: "../../../third_party/dart/sdk/lib/async/async.dart"
195-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart"
196-
197-
collection:
198-
uri: "../../../third_party/dart/sdk/lib/collection/collection.dart"
199-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart"
200-
201-
convert:
202-
uri: "../../../third_party/dart/sdk/lib/convert/convert.dart"
203-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart"
204-
205-
core:
206-
uri: "../../../third_party/dart/sdk/lib/core/core.dart"
207-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart"
208-
209-
developer:
210-
uri: "../../../third_party/dart/sdk/lib/developer/developer.dart"
211-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart"
212-
213-
io:
214-
uri: "../../../third_party/dart/sdk/lib/io/io.dart"
215-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart"
216-
supported: false
217-
218-
isolate:
219-
uri: "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
220-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart"
221-
supported: false
222-
223-
mirrors:
224-
uri: "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
225-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart"
226-
supported: false
227-
228-
math:
229-
uri: "../../../third_party/dart/sdk/lib/math/math.dart"
230-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart"
231-
232-
typed_data:
233-
uri: "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
234-
patches: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart"
235-
236-
html:
237-
uri: "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart"
238-
239-
html_common:
240-
uri: "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart"
241-
242-
indexed_db:
243-
uri: "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
244-
245-
js:
246-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart"
247-
248-
js_util:
249-
uri: "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart"
250-
251-
svg:
252-
uri: "../../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"
253-
254-
web_audio:
255-
uri: "../../../third_party/dart/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
256-
257-
web_gl:
258-
uri: "../../../third_party/dart/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
259-
260-
web_sql:
261-
uri: "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
262-
263-
ui:
264-
uri: "flutter/lib/stub_ui/ui.dart"

lib/stub_ui/BUILD.gn

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)