Revert "Revert "Roll dart to pick up change where platform.dill was removed (#4180)" (#4185)" (#4186)
This reverts commit a89f46696d4bc16d814f6697f46e9514b1193b0e.
Doing the synchronized roll of Dart into engine as well as into Fuchsia
to prevent Fuchsia breakage.
diff --git a/DEPS b/DEPS
index a8f5639..258ff1b 100644
--- a/DEPS
+++ b/DEPS
@@ -31,7 +31,7 @@
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
- 'dart_revision': '9ee73fe322ce3875a6b1f16ba16d64b11c680e90',
+ 'dart_revision': '90587a6837c5ad4a64d571397a8ba65a7cc3f44f',
'dart_args_tag': '0.13.7',
'dart_async_tag': '2.0.0',
@@ -48,7 +48,7 @@
'dart_csslib_tag': '0.14.1',
'dart_dart2js_info_tag': '0.5.5+1',
'dart_dart_style_tag': '1.0.7',
- 'dart_dartdoc_tag': 'v0.13.0+3',
+ 'dart_dartdoc_tag': 'v0.14.1',
'dart_fixnum_tag': '0.10.5',
'dart_glob_tag': '1.1.5',
'dart_html_tag': '0.13.2',
diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
index f67ac2d..48ff46a 100644
--- a/lib/snapshot/BUILD.gn
+++ b/lib/snapshot/BUILD.gn
@@ -322,9 +322,12 @@
# libraries.
generate_patched_sdk(target_name) {
mode = "flutter"
- deps = concatenation_target_names + ["//dart/runtime/vm:patched_sdk"]
+ deps = concatenation_target_names + ["//dart/runtime/vm:kernel_platform_files"]
input_patches_dir = "$target_gen_dir/patches"
patched_sdk_dir = "flutter_patched_sdk"
+ outputs = [
+ "$root_out_dir/${patched_sdk_dir}/lib/libraries.json",
+ ]
}
}
@@ -387,3 +390,36 @@
],
]
}
+
+action("compile_platform") {
+ script = "//dart/tools/compile_platform.py"
+
+ sources = [
+ "$root_out_dir/flutter_patched_sdk/lib/libraries.json",
+ ]
+
+ outputs = [
+ "$root_out_dir/flutter_patched_sdk/platform.dill",
+ "$root_out_dir/flutter_patched_sdk/vm_outline.dill",
+ ]
+
+ inputs = []
+
+ deps = [
+ ":flutter_patched_sdk",
+ ]
+
+ depfile = "$root_out_dir/flutter_patched_sdk/platform.dill.d"
+
+ args = [
+ "--target=flutter",
+ "dart:core"
+ ] + rebase_path(sources, root_build_dir) +
+ rebase_path(outputs, root_build_dir)
+}
+
+group("kernel_platform_files") {
+ public_deps = [
+ ":compile_platform",
+ ]
+}
diff --git a/travis/licenses_golden/licenses_dart b/travis/licenses_golden/licenses_dart
index c18078b..7411fb9 100644
--- a/travis/licenses_golden/licenses_dart
+++ b/travis/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: cda91405b88ecd9ce6b78876552348c6
+Signature: ec2f9d17b9193fc1d549c977d8f8cc81
UNUSED LICENSES:
