From b26eef620e19564d8bdcdd767b6ae2571b374c4a Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Tue, 5 Mar 2019 16:50:43 -0800 Subject: [PATCH 1/2] remove extra source files --- BUILD.gn | 82 +------------------------------------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index bbd82204f17b6..4c6e8ca7ce514 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,19 +3,7 @@ # found in the LICENSE file. import("$flutter_root/common/config.gni") -import("//third_party/dart/build/dart/dart_action.gni") - -# Temporary snapshot copy rules until we can use the full SDK. -_flutter_sdk_snapshots = [ - [ - "dart2js", - "//third_party/dart/utils/compiler:dart2js", - ], - [ - "kernel_worker", - "//third_party/dart/utils/bazel:kernel_worker", - ], -] +import("//third_party/dart/build/dart/dart_action.gni")] group("flutter") { testonly = true @@ -37,12 +25,7 @@ group("flutter") { "$flutter_root/frontend_server", "//third_party/dart:create_sdk", "$flutter_root/lib/stub_ui:stub_ui", - ":dart2js_platform_files", - ":flutter_dartdevc_kernel_sdk", ] - foreach(snapshot, _flutter_sdk_snapshots) { - public_deps += [ ":copy_flutter_${snapshot[0]}_snapshot" ] - } } } @@ -81,66 +64,3 @@ group("dist") { "$flutter_root/sky/dist", ] } - -foreach(snapshot, _flutter_sdk_snapshots) { - copy("copy_flutter_${snapshot[0]}_snapshot") { - deps = [ - snapshot[1], - ] - sources = [ - "$root_gen_dir/${snapshot[0]}.dart.snapshot", - ] - outputs = [ - "$root_out_dir/dart-sdk/bin/snapshots/flutter_{{source_file_part}}", - ] - } -} - -copy("dart2js_platform_files") { - deps = [ - "//third_party/dart/utils/compiler:compile_dart2js_platform" - ] - - sources = [ - "$root_out_dir/dart2js_outline.dill", - "$root_out_dir/dart2js_platform.dill", - ] - - outputs = [ - "$root_out_dir/flutter_patched_sdk/{{source_file_part}}", - ] -} - - -prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { - deps = [ - "//third_party/dart:create_sdk", - ] - - packages = "//third_party/dart/.packages" - - script = "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart" - - inputs = [ - "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart", - ] - - outputs = [ - "$target_gen_dir/kernel/amd/dart_sdk.js", - "$target_gen_dir/kernel/amd/dart_sdk.js.map", - "$target_gen_dir/kernel/common/dart_sdk.js", - "$target_gen_dir/kernel/common/dart_sdk.js.map", - "$target_gen_dir/kernel/es6/dart_sdk.js", - "$target_gen_dir/kernel/es6/dart_sdk.js.map", - "$target_gen_dir/kernel/legacy/dart_sdk.js", - "$target_gen_dir/kernel/legacy/dart_sdk.js.map", - ] - - libraries_path = rebase_path("$flutter_root/lib/snapshot/libraries.json") - output_path = rebase_path("$target_gen_dir/kernel/flutter_ddc_sdk.dill") - - args = [ - "--output=$output_path", - "--libraries=$libraries_path", - ] -} From c5af3704bf8897f697ab0838df29c687c1b658a2 Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 5 Mar 2019 16:52:47 -0800 Subject: [PATCH 2/2] Update BUILD.gn --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 4c6e8ca7ce514..a320299636089 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("$flutter_root/common/config.gni") -import("//third_party/dart/build/dart/dart_action.gni")] +import("//third_party/dart/build/dart/dart_action.gni") group("flutter") { testonly = true