diff --git a/pkg/compiler/lib/src/library_loader.dart b/pkg/compiler/lib/src/library_loader.dart index b4832ee9ce5..e4295e888d9 100644 --- a/pkg/compiler/lib/src/library_loader.dart +++ b/pkg/compiler/lib/src/library_loader.dart @@ -56,7 +56,7 @@ class LibraryLoaderTask extends CompilerTask { } else { String targetName = _options.compileForServer ? "dart2js_server" : "dart2js"; - String platform = '${targetName}_platform_strong.dill'; + String platform = '${targetName}_platform.dill'; initializedCompilerState = fe.initializeCompiler( initializedCompilerState, new Dart2jsTarget(targetName, new TargetFlags(strongMode: true)), diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 857219e24e8..5bd19c1fab5 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -516,14 +516,10 @@ copy("copy_dart2js_dill_files") { ":copy_libraries", "../utils/compiler:compile_dart2js_platform", "../utils/compiler:compile_dart2js_server_platform", - "../utils/compiler:compile_dart2js_platform_strong", - "../utils/compiler:compile_dart2js_server_platform_strong", ] sources = [ "$root_out_dir/dart2js_platform.dill", "$root_out_dir/dart2js_server_platform.dill", - "$root_out_dir/dart2js_platform_strong.dill", - "$root_out_dir/dart2js_server_platform_strong.dill", ] outputs = [ "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}", diff --git a/utils/compiler/BUILD.gn b/utils/compiler/BUILD.gn index f6024c4430b..3dbee83dbb7 100644 --- a/utils/compiler/BUILD.gn +++ b/utils/compiler/BUILD.gn @@ -60,14 +60,11 @@ dart_action("dart2js_create_snapshot_entry") { application_snapshot("dart2js") { deps = [ ":compile_dart2js_platform", - ":compile_dart2js_platform_strong", ":dart2js_create_snapshot_entry", ] inputs = [ "$root_out_dir/dart2js_platform.dill", "$root_out_dir/dart2js_outline.dill", - "$root_out_dir/dart2js_platform_strong.dill", - "$root_out_dir/dart2js_outline_strong.dill", ] vm_args = [] main_dart = "$target_gen_dir/dart2js.dart" @@ -89,29 +86,12 @@ compile_platform("compile_dart2js_platform") { "$root_out_dir/dart2js_outline.dill", ] - args = [ - "--target=dart2js", - "dart:core", - ] -} - -compile_platform("compile_dart2js_platform_strong") { - single_root_scheme = "org-dartlang-sdk" - single_root_base = rebase_path("../../") - libraries_specification_uri = "org-dartlang-sdk:///sdk/lib/libraries.json" - - outputs = [ - "$root_out_dir/dart2js_platform_strong.dill", - "$root_out_dir/dart2js_outline_strong.dill", - ] - args = [ "--target=dart2js", "--strong", "dart:core", ] } - compile_platform("compile_dart2js_server_platform") { single_root_scheme = "org-dartlang-sdk" single_root_base = rebase_path("../../") @@ -122,22 +102,6 @@ compile_platform("compile_dart2js_server_platform") { "$root_out_dir/dart2js_server_outline.dill", ] - args = [ - "--target=dart2js_server", - "dart:core", - ] -} - -compile_platform("compile_dart2js_server_platform_strong") { - single_root_scheme = "org-dartlang-sdk" - single_root_base = rebase_path("../../") - libraries_specification_uri = "org-dartlang-sdk:///sdk/lib/libraries.json" - - outputs = [ - "$root_out_dir/dart2js_server_platform_strong.dill", - "$root_out_dir/dart2js_server_outline_strong.dill", - ] - args = [ "--target=dart2js_server", "--strong", diff --git a/utils/dartdevc/BUILD.gn b/utils/dartdevc/BUILD.gn index 6fecc509af6..03be2cc710d 100644 --- a/utils/dartdevc/BUILD.gn +++ b/utils/dartdevc/BUILD.gn @@ -83,7 +83,6 @@ template("dart2js_compile") { dart_action(target_name) { deps = [ "../compiler:compile_dart2js_platform", - "../compiler:compile_dart2js_platform_strong", ] # dart_action() needs kernel service snapshot to run in Dart 2 mode. @@ -94,8 +93,6 @@ template("dart2js_compile") { inputs = sdk_lib_files + compiler_files + dev_compiler_files + [ "$root_out_dir/dart2js_platform.dill", "$root_out_dir/dart2js_outline.dill", - "$root_out_dir/dart2js_platform_strong.dill", - "$root_out_dir/dart2js_outline_strong.dill", ] outputs = [ out,