Roll Dart to ac6d4f7. (flutter#6549)

malkia · Oct 15, 2018 · aed6b8c · aed6b8c
1 parent 3ba6270
commit aed6b8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 42 deletions.
diff --git a/DEPS b/DEPS
@@ -31,7 +31,7 @@ vars = {
   # 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': 'b99bcfd3099f0d32e39287160a9539e878cb0b68',
+  'dart_revision': 'ac6d4f7e653deba11d4836768376537893a9e9d6',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 7c3937f9c7241377fd191ec55d536a6a
+Signature: aafea799ed666129bcb0e64c356e77f1
 
 UNUSED LICENSES:
 
@@ -4432,6 +4432,7 @@ ORIGIN: ../../../third_party/dart/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../third_party/dart/.gitconfig
 FILE: ../../../third_party/dart/.mailmap
+FILE: ../../../third_party/dart/.vpython
 FILE: ../../../third_party/dart/client/idea/.idea/.name
 FILE: ../../../third_party/dart/client/idea/.idea/inspectionProfiles/Project_Default.xml
 FILE: ../../../third_party/dart/client/idea/.idea/vcs.xml
@@ -5271,7 +5272,6 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/sourc
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/target.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/thread.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/timeline_event.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/token_stream.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/type_arguments.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/unknown.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/models/objects/vm.dart
@@ -5458,6 +5458,8 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.c
 FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_kbc.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/backend/code_statistics.h
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.cc
+FILE: ../../../third_party/dart/runtime/vm/compiler/backend/loops.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_state.h
@@ -5542,8 +5544,6 @@ FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.cc
 FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler.h
 FILE: ../../../third_party/dart/runtime/vm/compiler/assembler/disassembler_test.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler_stats.cc
-FILE: ../../../third_party/dart/runtime/vm/compiler_stats.h
 FILE: ../../../third_party/dart/runtime/vm/cpu_ia32.cc
 FILE: ../../../third_party/dart/runtime/vm/custom_isolate_test.cc
 FILE: ../../../third_party/dart/runtime/vm/dart.h
@@ -5879,7 +5879,6 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_va
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/sentinel_view.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/source_inset.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/stack_trace_tree_config.dart
-FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/token_stream_ref.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/type_arguments_ref.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/unknown_ref.dart
 FILE: ../../../third_party/dart/runtime/observatory/lib/src/elements/vm_view.dart

diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -6,41 +6,6 @@ import("//third_party/dart/runtime/bin/vmservice/vmservice_sources.gni")
 import("$flutter_root/common/config.gni")
 import("$flutter_root/testing/testing.gni")
 
-action("gen_embedded_resources_cc") {
-  script = "//third_party/dart/runtime/tools/create_resources.py"
-  output_file = "$target_gen_dir/embedded_resources.cc"
-  outputs = [
-    output_file,
-  ]
-
-  inputs = rebase_path(vmservice_sources,
-                       "",
-                       "//third_party/dart/runtime/bin/vmservice")
-
-  args = [
-           "--output",
-           rebase_path(output_file),
-           "--outer_namespace",
-           "flutter",
-           "--inner_namespace",
-           "runtime",
-           "--table_name",
-           "flutter_embedded_service_isolate",
-           "--root_prefix",
-           rebase_path("//third_party/dart/runtime/bin/"),
-         ] + rebase_path(inputs)
-}
-
-source_set("embedded_resources_cc") {
-  sources = [
-    "$target_gen_dir/embedded_resources.cc",
-  ]
-  deps = [
-    ":gen_embedded_resources_cc",
-  ]
-  public_configs = [ "$flutter_root:config" ]
-}
-
 source_set("test_font") {
   sources = [
     "test_font_data.cc",
@@ -84,7 +49,6 @@ source_set("runtime") {
   ]
 
   deps = [
-    ":embedded_resources_cc",
     ":test_font",
     "$flutter_root/assets",
     "$flutter_root/common",