languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ddc] Fix break on --no-nnbd build

Browse source 
Avoid trying to copy sound null safety sdk outline .dill when building
the legacy SDK.

Change-Id: Ib0a15e7812686bb048805ce9b11abb62031b3567
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/149481
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Nicholas Shahan <nshahan@google.com>
This commit is contained in:
Nicholas Shahan 2020-05-29 19:05:44 +00:00 committed by commit-bot@chromium.org
parent f2bb32bce1
commit 134c5c32dc
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sdk/BUILD.gn
View file

@ -628,15 +628,15 @@ copy("copy_dart2js_dill_files") {
outputs = [ "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}" ]
}
# This rule copies ddc summaries to lib/_internal
copy("copy_dev_compiler_summary") {
# Copies DDC's SDK outline .dill to lib/_internal
copy("copy_dev_compiler_outline") {
visibility = [ ":copy_dev_compiler_sdk" ]
deps = [
":copy_libraries",
"../utils/dartdevc:dartdevc_platform",
]
sources = [ "$root_out_dir/ddc_sdk.dill" ]
outputs = [ "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}" ]
sources = [ "$root_out_dir/ddc_outline.dill" ]
outputs = [ "$root_out_dir/dart-sdk/lib/_internal/ddc_sdk.dill" ]
}
# This rule copies DDK's JS SDK and require.js to lib/dev_compiler/kernel/amd.
@ -716,7 +716,7 @@ group("copy_dev_compiler_sdk") {
visibility = [ ":create_full_sdk" ]
public_deps = [
":copy_dev_compiler_js",
":copy_dev_compiler_summary",
":copy_dev_compiler_outline",
":copy_dev_compiler_tools",
]
}

10
utils/dartdevc/BUILD.gn
View file

@ -146,11 +146,13 @@ group("dartdevc_test") {
":dartdevc_sound_sdk",
":dartdevc_test_kernel_pkg",
"../..:create_sdk",
# TODO(nshahan) Temporarily here until we decide if we are going to include
# in the create_sdk target.
"../../sdk_nnbd:copy_dev_compiler_outline_sound",
]
# TODO(nshahan) Temporarily here until we decide if we are going to include
# in the create_sdk target.
if (!dont_use_nnbd) {
deps += [ "../../sdk_nnbd:copy_dev_compiler_outline_sound" ]
}
}
# Builds everything needed to run dartdevc tests locally using test.dart without