Skip to content

Commit c1ce43f

Browse files
nshahanCommit Queue
authored andcommitted
[ddc] Remove unsound dart2js dependency
DDC does not depend on the stack trace mapper application being built with unsound null safety so the unsound .dill files are unused. Add the unsound .dill files to the `dart2js_bot` target because they are dependencies of the `dart2js-hostasserts-linux-unsound` and `dart2js-unit-linux-x64-release` configurations. Update build step of `front-end-linux-release-x64` configuraton to build the dart2js_bot target instead of relying on the unsound dart2js .dill files through the `ddc_stable_test` target. Change-Id: Ia29740b60f93d1d0b4a978ff5e37080e537401a7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403382 Reviewed-by: Sigmund Cherem <[email protected]> Commit-Queue: Nicholas Shahan <[email protected]>
1 parent b69f6c1 commit c1ce43f

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

BUILD.gn

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,10 @@ group("tools") {
202202
# It must depend on anything that is required by the dart2js
203203
# test suites.
204204
group("dart2js_bot") {
205-
deps = [ ":create_sdk" ]
205+
deps = [
206+
":create_sdk",
207+
"utils/compiler:compile_dart2js_platform_unsound",
208+
]
206209
}
207210

208211
# This rule and the compressed_observatory_archive rule are for the Fuchsia

tools/bots/test_matrix.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@
677677
"script": "tools/build.py",
678678
"arguments": [
679679
"create_sdk",
680+
"dart2js_bot",
680681
"ddc_stable_test",
681682
"kernel_platform_files",
682683
"runtime"
@@ -2487,7 +2488,7 @@
24872488
"name": "build dart",
24882489
"script": "tools/build.py",
24892490
"arguments": [
2490-
"create_sdk"
2491+
"dart2js_bot"
24912492
]
24922493
},
24932494
{

utils/ddc/BUILD.gn

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,11 @@ template("dart2js_compile") {
6262
abs_output = rebase_path(out)
6363

6464
prebuilt_dart_action(target_name) {
65-
deps = invoker.deps + [
66-
"../compiler:compile_dart2js_platform",
67-
"../compiler:compile_dart2js_platform_unsound",
68-
]
65+
deps = invoker.deps + [ "../compiler:compile_dart2js_platform" ]
6966

7067
inputs = [
7168
"$root_out_dir/dart2js_platform.dill",
72-
"$root_out_dir/dart2js_platform_unsound.dill",
7369
"$root_out_dir/dart2js_outline.dill",
74-
"$root_out_dir/dart2js_outline_unsound.dill",
7570
]
7671
outputs = [ out ]
7772

0 commit comments

Comments
 (0)