Manual roll of Dart from 24c7666...40fd1c4 (flutter#20092)

* Manual roll of Dart from 24c7666...40fd1c4 dart-lang/sdk@40fd1c456e Revert "[dart:io] Add Abort() on HttpClientRequest" dart-lang/sdk@17d7296a42 [vm/nnbd/bytecode] Fix reuse of type arguments in bytecode dart-lang/sdk@58b6f40c73 Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns. (reland) dart-lang/sdk@fc8a6d9f9b [VM/compiler] Dereference TypeRef literal when propagating constants. dart-lang/sdk@0689ec527a Move "test.dart" (well, most of its contents) into pkg/test_runner. dart-lang/sdk@1094b3c61d Prepare static error test updater tool to handle web tests. dart-lang/sdk@b258585f2f [observatory] Migrate from deprecated isInstanceOf to isA. dart-lang/sdk@dfe1d9b682 Disable OverrideContributor for Cider. dart-lang/sdk@aea99b2f5c scope debug property assist to Diagnosticables dart-lang/sdk@4b96f20a79 [dart:io] Add Abort() on HttpClientRequest dart-lang/sdk@1b1a39708c [build] Use frameworks instead of libs dart-lang/sdk@3fef522496 Revert "Reland "[vm] Replaces fuchsia.deprecatedtimezone"" dart-lang/sdk@8c664d4f3f Revert "Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns." dart-lang/sdk@2efb5bebc7 [ dart:_http ] Fix typo in HTTP response timeline event dart-lang/sdk@0884dae36c Revert "Fix the #include path for ICU headers" dart-lang/sdk@5171534e81 Scope tweaks. Report REFERENCED_BEFORE_DECLARATION in more places. dart-lang/sdk@6bba75079a Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns. dart-lang/sdk@b4ebbb7f5c [build] Update gn to match Fuchsia dart-lang/sdk@cb428a7a02 [dart2js] Remove old bug work around in collector. dart-lang/sdk@08663c20ab Change flutter patch to match existing DEPS on master branch dart-lang/sdk@146ad014d9 update js/meta for the 2.10 dev sdk dart-lang/sdk@488c718793 [co19] Roll co19 to d79951e06e443213243e54c2c32694b79a221b65 dart-lang/sdk@ba20edd7be Add patch for flutter-engine when changing to version 2.10 * Rev buildroot to latest version. * Update license. * update. * Update gn revision. * Format BUILD.gn files as the gn revision has been updated.
nstrelow · Jul 29, 2020 · b955e15 · b955e15
1 parent 49a40fa
commit b955e15
Show file tree

Hide file tree

Showing 69 changed files with 269 additions and 722 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -37,9 +37,7 @@ config("fuchsia_legacy") {
 
 config("export_dynamic_symbols") {
   if (is_linux || is_fuchsia) {
-    inputs = [
-      "//flutter/common/exported_symbols.sym",
-    ]
+    inputs = [ "//flutter/common/exported_symbols.sym" ]
     ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
   }
 }
@@ -165,17 +163,13 @@ group("flutter") {
 group("dist") {
   testonly = true
 
-  deps = [
-    "//flutter/sky/dist",
-  ]
+  deps = [ "//flutter/sky/dist" ]
 }
 
 if (is_fuchsia) {
   group("fuchsia_tests") {
     testonly = true
 
-    deps = [
-      "//flutter/shell/platform/fuchsia:tests",
-    ]
+    deps = [ "//flutter/shell/platform/fuchsia:tests" ]
   }
 }
diff --git a/DEPS b/DEPS
@@ -34,7 +34,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': '24c7666def53832a31559beac130eb3336008110',
+  'dart_revision': '40fd1c456e0a872ab8f6d2a018b3436d2f7a5f84',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -107,7 +107,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '6728d80355083a20ceecb6db1d73c16dee255a43',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '4073a7a300d845597b8b2d553e584d3fd97f70df',
 
    # Fuchsia compatibility
    #
@@ -485,7 +485,7 @@ deps = {
     'packages': [
       {
         'package': 'gn/gn/${{platform}}',
-        'version': 'git_revision:152c5144ceed9592c20f0c8fd55769646077569b'
+        'version': 'git_revision:1e3fd10c5df6b704fc764ee388149e4f32862823'
       },
     ],
     'dep_type': 'cipd',

diff --git a/build/dart/rules.gni b/build/dart/rules.gni
@@ -163,12 +163,8 @@ template("dart_pkg") {
       dartx_application("${app_name}_dart_app") {
         output_name = dartx_output_name
         main_dart = rebase_path(app_entrypoint, "", pkg_helper_output_dir)
-        sources = [
-          "$root_gen_dir/dart-pkg/${dart_package_name}.stamp",
-        ]
-        deps = [
-          ":$dart_pkg_target_name",
-        ]
+        sources = [ "$root_gen_dir/dart-pkg/${dart_package_name}.stamp" ]
+        deps = [ ":$dart_pkg_target_name" ]
         deps += invoker.deps
         if (defined(invoker.strict)) {
           strict = invoker.strict
@@ -178,9 +174,7 @@ template("dart_pkg") {
   }
 
   group(target_name) {
-    public_deps = [
-      ":$dart_pkg_target_name",
-    ]
+    public_deps = [ ":$dart_pkg_target_name" ]
     if (defined(invoker.apps)) {
       foreach(app, invoker.apps) {
         app_name = app[0]

diff --git a/build/zip_bundle.gni b/build/zip_bundle.gni
@@ -37,9 +37,7 @@ template("zip_bundle") {
   assert(defined(invoker.files), "files must be defined as a list of scopes")
   action(target_name) {
     script = "//flutter/build/zip.py"
-    outputs = [
-      "$root_build_dir/zip_archives/${invoker.output}",
-    ]
+    outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ]
     inputs = []
     deps = invoker.deps
 

diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: ace4b50b35dcf1f0615ef82b87950698
+Signature: 97a28766592ed592458b78e7da5d05fd
 
 UNUSED LICENSES:
 

diff --git a/common/BUILD.gn b/common/BUILD.gn
@@ -16,9 +16,7 @@ source_set("common") {
     "task_runners.h",
   ]
 
-  deps = [
-    "//flutter/fml",
-  ]
+  deps = [ "//flutter/fml" ]
 
   public_configs = [
     ":flutter_config",

diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -183,24 +183,18 @@ if (enable_unittests) {
     executable("flow_unittests") {
       testonly = true
 
-      deps = [
-        ":flow_unittests_common_fuchsia_legacy",
-      ]
+      deps = [ ":flow_unittests_common_fuchsia_legacy" ]
     }
     executable("flow_unittests_next") {
       testonly = true
 
-      deps = [
-        ":flow_unittests_common",
-      ]
+      deps = [ ":flow_unittests_common" ]
     }
   } else {
     executable("flow_unittests") {
       testonly = true
 
-      deps = [
-        ":flow_unittests_common",
-      ]
+      deps = [ ":flow_unittests_common" ]
     }
   }
 }
diff --git a/flutter_frontend_server/BUILD.gn b/flutter_frontend_server/BUILD.gn
@@ -22,9 +22,7 @@ frontend_server_files +=
 
 application_snapshot("frontend_server") {
   main_dart = "bin/starter.dart"
-  deps = [
-    "//flutter/lib/snapshot:kernel_platform_files",
-  ]
+  deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]
   dot_packages = rebase_path(".dart_tool/package_config.json")
   flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
   training_args = [

diff --git a/fml/BUILD.gn b/fml/BUILD.gn
@@ -230,9 +230,7 @@ if (enable_unittests) {
   executable("fml_benchmarks") {
     testonly = true
 
-    sources = [
-      "message_loop_task_queues_benchmark.cc",
-    ]
+    sources = [ "message_loop_task_queues_benchmark.cc" ]
 
     deps = [
       "//flutter/benchmarking",

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -14,9 +14,7 @@ copy("generate_dart_ui") {
   visibility = [ ":*" ]
   sources = dart_ui_files
 
-  outputs = [
-    "$bindings_output_dir/dart_ui/{{source_file_part}}",
-  ]
+  outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ]
 }
 
 compiled_action("generate_snapshot_bin") {
@@ -32,12 +30,8 @@ compiled_action("generate_snapshot_bin") {
 
   platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
 
-  inputs = [
-    platform_kernel,
-  ]
-  deps = [
-    ":kernel_platform_files",
-  ]
+  inputs = [ platform_kernel ]
+  deps = [ ":kernel_platform_files" ]
 
   vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin"
   vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
@@ -109,9 +103,7 @@ template("bin_to_assembly") {
       script,
       invoker.input,
     ]
-    outputs = [
-      output,
-    ]
+    outputs = [ output ]
   }
 }
 
@@ -150,12 +142,8 @@ template("bin_to_coff") {
     if (current_cpu == "x64") {
       args += [ "--64-bit" ]
     }
-    inputs = [
-      invoker.input,
-    ]
-    outputs = [
-      output,
-    ]
+    inputs = [ invoker.input ]
+    outputs = [ output ]
   }
 }
 
@@ -174,45 +162,35 @@ template("bin_to_linkable") {
 }
 
 bin_to_linkable("vm_snapshot_data_linkable") {
-  deps = [
-    ":generate_snapshot_bin",
-  ]
+  deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/vm_isolate_snapshot.bin"
   symbol = "kDartVmSnapshotData"
   executable = false
 }
 
 bin_to_linkable("vm_snapshot_instructions_linkable") {
-  deps = [
-    ":generate_snapshot_bin",
-  ]
+  deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/vm_snapshot_instructions.bin"
   symbol = "kDartVmSnapshotInstructions"
   executable = true
 }
 
 bin_to_linkable("isolate_snapshot_data_linkable") {
-  deps = [
-    ":generate_snapshot_bin",
-  ]
+  deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/isolate_snapshot.bin"
   symbol = "kDartIsolateSnapshotData"
   executable = false
 }
 
 bin_to_linkable("isolate_snapshot_instructions_linkable") {
-  deps = [
-    ":generate_snapshot_bin",
-  ]
+  deps = [ ":generate_snapshot_bin" ]
   input = "$target_gen_dir/isolate_snapshot_instructions.bin"
   symbol = "kDartIsolateSnapshotInstructions"
   executable = true
 }
 
 bin_to_linkable("platform_strong_dill_linkable") {
-  deps = [
-    ":kernel_platform_files",
-  ]
+  deps = [ ":kernel_platform_files" ]
   input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
   symbol = "kPlatformStrongDill"
   size_symbol = "kPlatformStrongDillSize"
@@ -261,7 +239,5 @@ compile_platform("strong_platform") {
 
 # Fuchsia's snapshot requires a different platform with extra dart: libraries.
 group("kernel_platform_files") {
-  public_deps = [
-    ":strong_platform",
-  ]
+  public_deps = [ ":strong_platform" ]
 }
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -113,9 +113,7 @@ source_set_maybe_fuchsia_legacy("ui") {
 
   public_configs = [ "//flutter:config" ]
 
-  public_deps = [
-    "//flutter/third_party/txt",
-  ]
+  public_deps = [ "//flutter/third_party/txt" ]
 
   deps = [
     "//flutter/assets",
@@ -163,9 +161,7 @@ if (enable_unittests) {
 
     public_configs = [ "//flutter:export_dynamic_symbols" ]
 
-    sources = [
-      "ui_benchmarks.cc",
-    ]
+    sources = [ "ui_benchmarks.cc" ]
 
     deps = [
       ":ui",
@@ -213,24 +209,18 @@ if (enable_unittests) {
     executable("ui_unittests") {
       testonly = true
 
-      deps = [
-        ":ui_unittests_common_fuchsia_legacy",
-      ]
+      deps = [ ":ui_unittests_common_fuchsia_legacy" ]
     }
     executable("ui_unittests_next") {
       testonly = true
 
-      deps = [
-        ":ui_unittests_common",
-      ]
+      deps = [ ":ui_unittests_common" ]
     }
   } else {
     executable("ui_unittests") {
       testonly = true
 
-      deps = [
-        ":ui_unittests_common",
-      ]
+      deps = [ ":ui_unittests_common" ]
     }
   }
 }
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
@@ -10,9 +10,7 @@ source_set("test_font") {
     "test_font_data.cc",
     "test_font_data.h",
   ]
-  deps = [
-    "//third_party/skia",
-  ]
+  deps = [ "//third_party/skia" ]
   public_configs = [ "//flutter:config" ]
   defines = []
   if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
@@ -69,9 +67,7 @@ source_set_maybe_fuchsia_legacy("runtime") {
     "window_data.h",
   ]
 
-  public_deps = [
-    "//third_party/rapidjson",
-  ]
+  public_deps = [ "//third_party/rapidjson" ]
 
   public_configs = [ "//flutter:config" ]
 
@@ -142,25 +138,19 @@ if (enable_unittests) {
     executable("runtime_unittests") {
       testonly = true
 
-      deps = [
-        ":runtime_unittests_common_fuchsia_legacy",
-      ]
+      deps = [ ":runtime_unittests_common_fuchsia_legacy" ]
     }
 
     executable("runtime_unittests_next") {
       testonly = true
 
-      deps = [
-        ":runtime_unittests_common",
-      ]
+      deps = [ ":runtime_unittests_common" ]
     }
   } else {
     executable("runtime_unittests") {
       testonly = true
 
-      deps = [
-        ":runtime_unittests_common",
-      ]
+      deps = [ ":runtime_unittests_common" ]
     }
   }
 }
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
@@ -3,7 +3,5 @@
 # found in the LICENSE file.
 
 group("shell") {
-  deps = [
-    "platform",
-  ]
+  deps = [ "platform" ]
 }