Update checked-in Dart SDK to 2.0.0-dev.64.1

Updated to pass --dfe to invocations of the
checked-in SDK.

Change-Id: I47e122422926d235f166972669c8c2cb18a89735
Reviewed-on: https://dart-review.googlesource.com/62201
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
This commit is contained in:
Zach Anderson 2018-06-25 21:39:35 +00:00 committed by commit-bot@chromium.org
parent 9d3533ff72
commit b15572933d
7 changed files with 13 additions and 13 deletions

View file

@ -144,6 +144,11 @@ template("_prebuilt_tool_action") {
"--packages=" + rebase_path(invoker.packages),
]
}
if (defined(invoker.dfe)) {
args += [
"--dfe=" + rebase_path(invoker.dfe),
]
}
if (defined(invoker.script)) {
args += [ rebase_path(invoker.script) ]
}
@ -219,9 +224,12 @@ template("prebuilt_dart_action") {
forward_variables_from(invoker, "*")
if (_is_fuchsia) {
binary = prebuilt_dart
dfe = "$prebuilt_dart_sdk/bin/snapshots/kernel-service.dart.snapshot"
} else {
binary =
"$_dart_root/tools/sdks/$host_os/dart-sdk/bin/dart$executable_suffix"
dfe =
"$_dart_root/tools/sdks/$host_os/dart-sdk/bin/snapshots/kernel-service.dart.snapshot"
}
target = "$_dart_root/runtime/bin:dart_bootstrap"
}

View file

@ -179,6 +179,7 @@ def Build(dart_executable,
if not silent:
DisplayBootstrapWarning()
command = [dart_executable, DART2JS_PATH]
command += ['--no-preview-dart-2']
command += ['-DOBS_VER=' + utils.GetVersion(no_git_hash=True)]
command += [script_path, '-o', output_path, '--packages=%s' % packages_path]
# Add the defaults pub used

View file

@ -1 +1 @@
2abdfae6bf237e3d10e7d6e7680e62653c59f167
cb26a440fbe1a3cef64c580ee9055a746278ea82

View file

@ -1 +1 @@
e2d609d355ce8e8a0de9dc107818055fead5c6c1
c66ec04f2b2e00c30b307eb2275a2bd91fa97287

View file

@ -1 +1 @@
c5cca53d8fa715c6409eca288cd5560d55d50bdc
26a6441397eea6cf00c7b3e565de4aa40c43a9c6

View file

@ -16,8 +16,7 @@ def Main():
tools_dir = os.path.dirname(os.path.realpath(__file__))
dart_test_script = string.join(
[tools_dir, 'testing', 'dart', 'main.dart'], os.sep)
command = [utils.CheckedInSdkExecutable(),
'--checked', dart_test_script] + args
command = [utils.CheckedInSdkExecutable(), dart_test_script] + args
# The testing script potentially needs the android platform tools in PATH so
# we do that in ./tools/test.py (a similar logic exists in ./tools/build.py).

View file

@ -130,8 +130,6 @@ dart2js_compile("stack_trace_mapper") {
# Apply dev_compiler's patch files to create the Dart version of the dartdevc
# SDK.
prebuilt_dart_action("dartdevc_patch_sdk") {
vm_args = ["--preview-dart-2"]
# TODO(rnystrom): Unfork DDC's patch_sdk.dart script with the
# tools/patch_sdk.dart and then change this to use generate_patch_sdk().
deps = [
@ -173,8 +171,6 @@ prebuilt_dart_action("dartdevc_patch_sdk") {
# Compiles the Dart core libraries and DDC runtime to an analyzer summary and
# JS.
prebuilt_dart_action("dartdevc_sdk") {
vm_args = ["--preview-dart-2"]
deps = [
":dartdevc_files_stamp",
":dartdevc_patch_sdk",
@ -271,8 +267,6 @@ create_timestamp_file("dartdevc_sdk_patch_stamp") {
# Compiles the packages used by the tests to JS with dartdevc so that they are
# available for loading by the tests.
prebuilt_dart_action("dartdevc_test_pkg") {
vm_args = ["--preview-dart-2"]
deps = [
":dartdevc_files_stamp",
":dartdevc_sdk",
@ -334,8 +328,6 @@ prebuilt_dart_action("dartdevc_test_pkg") {
# Compiles the DDC SDK's kernel summary and JS code.
prebuilt_dart_action("dartdevk_sdk") {
vm_args = ["--preview-dart-2"]
deps = [
"../../pkg:pkg_files_stamp",
":dartdevc_files_stamp",