Trial PR to enable null safety unfork in the Dart SDK. (flutter#17818)

* Trial PR to enable null safety unfork in the Dart SDK. * Fix web-sdk builds. * Manua; Roll of Dart cab69e77066b0db305187fd6e618a4f524ae9efd...03429b20cd67f85d65cc589b529ab8c1a4780912 dart-lang/sdk@ cab69e7706 [BUILD] - Initial CL to unfork the NNBD Dart SDK NOTE: This is a trial submit and will be reverted immediately.
christopherfujino · Apr 28, 2020 · 494a63c · 494a63c
1 parent 887efcb
commit 494a63c
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 223 deletions.
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': '03429b20cd67f85d65cc589b529ab8c1a4780912',
+  'dart_revision': 'cab69e77066b0db305187fd6e618a4f524ae9efd',
 
   # 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/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -52,6 +52,7 @@ compiled_action("generate_snapshot_bin") {
   ]
 
   args = [
+    "--enable-experiment=non-nullable",
     "--snapshot_kind=core",
     "--enable_mirrors=false",
     "--vm_snapshot_data=" + rebase_path(vm_snapshot_data),
@@ -233,23 +234,6 @@ source_set("snapshot") {
             get_target_outputs(":platform_strong_dill_linkable")
 }
 
-compile_platform("non_strong_platform") {
-  single_root_scheme = "org-dartlang-sdk"
-  single_root_base = rebase_path("../../../")
-  libraries_specification_uri =
-      "org-dartlang-sdk:///flutter/lib/snapshot/libraries.json"
-
-  outputs = [
-    "$root_out_dir/flutter_patched_sdk/platform.dill",
-    "$root_out_dir/flutter_patched_sdk/vm_outline.dill",
-  ]
-
-  args = [
-    "--target=flutter",
-    "dart:core",
-  ]
-}
-
 compile_platform("strong_platform") {
   single_root_scheme = "org-dartlang-sdk"
   single_root_base = rebase_path("../../../")
@@ -265,6 +249,8 @@ compile_platform("strong_platform") {
       flutter_runtime_mode == "release" || flutter_runtime_mode == "jit_release"
   allow_causal_async_stacks = !is_runtime_mode_release
   args = [
+    "--enable-experiment=non-nullable",
+    "--nnbd-agnostic",
     "--target=flutter",
     "-Ddart.vm.product=$is_runtime_mode_release",
     "-Ddart.developer.causal_async_stacks=$allow_causal_async_stacks",

diff --git a/lib/snapshot/libraries.json b/lib/snapshot/libraries.json
@@ -4,155 +4,155 @@
   "flutter": {
     "libraries": {
       "_builtin": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/vm/bin/builtin.dart"
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/builtin.dart"
       },
-      "core": {
+      "_internal": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/internal/internal.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/core_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/array.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/array_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/bigint_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/bool_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/date_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/double.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/double_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/errors_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/expando_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/function.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/function_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/growable_array.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/identical_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/immutable_map.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/integers_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/invocation_mirror_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/lib_prefix.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/map_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/null_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/object_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/regexp_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/stacktrace.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/stopwatch_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_buffer_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/string_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/type_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/uri_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/weak_property.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/core/core.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/internal_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/class_id_fasta.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/print_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/symbol_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/internal/patch.dart"
+        ]
       },
       "async": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/async/async.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/async_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/deferred_load_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/schedule_microtask_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_patch.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/async/async.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/async_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/deferred_load_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/schedule_microtask_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/timer_patch.dart"
+        ]
       },
       "collection": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/collection/collection.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/collection_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/compact_hash.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart"
-      },
-      "ffi": {
-        "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_native_type_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/ffi_patch.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/ffi/ffi.dart"
-      },
-      "typed_data": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/typed_data_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/collection_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/compact_hash.dart"
+        ]
       },
-      "nativewrappers": {
-        "uri": "../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart"
+      "convert": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/convert/convert.dart",
+        "patches": "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/convert_patch.dart"
       },
-      "mirrors": {
+      "core": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/core/core.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirrors_impl.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/mirror_reference.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/core_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/array.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/array_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/bigint_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/bool_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/date_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/double.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/double_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/errors_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/expando_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/function.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/function_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/growable_array.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/identical_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/immutable_map.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/integers.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/integers_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/invocation_mirror_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/lib_prefix.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/map_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/null_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/object_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/regexp_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/stacktrace.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/stopwatch_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/string_buffer_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/string_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/type_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/uri_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/weak_property.dart"
+        ]
       },
       "developer": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/developer/developer.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/developer.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/profiler.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/timeline.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/developer.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/profiler.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/timeline.dart"
+        ]
       },
-      "isolate": {
+      "ffi": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/ffi/ffi.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/isolate_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/timer_impl.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart"
-      },
-      "_vmservice": {
-        "uri": "../../../third_party/dart/sdk/lib/vmservice/vmservice.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/ffi_dynamic_library_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/ffi_native_type_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/ffi_patch.dart"
+        ]
       },
       "wasm": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/wasm/wasm.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/wasm_patch.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/wasm/wasm.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/wasm_patch.dart"
+        ]
+      },
+      "_http": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/_http/http.dart"
       },
       "io": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/io/io.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/common_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/directory_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/eventhandler_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/file_system_entity_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/filter_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/io_service_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/namespace_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/platform_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/process_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/socket_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/stdio_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/secure_socket_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/bin/sync_socket_patch.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/io/io.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/common_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/directory_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/eventhandler_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/file_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/file_system_entity_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/filter_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/io_service_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/namespace_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/platform_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/process_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/stdio_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/secure_socket_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/sync_socket_patch.dart"
+        ]
       },
-      "_internal": {
+      "isolate": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/isolate/isolate.dart",
         "patches": [
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/internal_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/class_id_fasta.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/print_patch.dart",
-          "../../../third_party/dart/sdk/lib/_internal/vm/lib/symbol_patch.dart",
-          "../../../third_party/dart/sdk/lib/internal/patch.dart"
-        ],
-        "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart"
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/isolate_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/timer_impl.dart"
+        ]
       },
-      "convert": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/convert_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart"
+      "math": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/math/math.dart",
+        "patches": "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/math_patch.dart"
       },
-      "profiler": {
-        "uri": "../../../third_party/dart/sdk/lib/profiler/profiler.dart"
+      "mirrors": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/mirrors/mirrors.dart",
+        "patches": [
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/mirrors_patch.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/mirrors_impl.dart",
+          "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/mirror_reference.dart"
+        ]
       },
-      "math": {
-        "patches": "../../../third_party/dart/sdk/lib/_internal/vm/lib/math_patch.dart",
-        "uri": "../../../third_party/dart/sdk/lib/math/math.dart"
+      "nativewrappers": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/html/dartium/nativewrappers.dart"
       },
-      "_http": {
-        "uri": "../../../third_party/dart/sdk/lib/_http/http.dart"
+      "profiler": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/profiler/profiler.dart"
+      },
+      "typed_data": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/typed_data/typed_data.dart",
+        "patches": "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/lib/typed_data_patch.dart"
       },
       "ui": {
         "uri": "../../lib/ui/ui.dart"
       },
+      "_vmservice": {
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/vmservice/vmservice.dart"
+      },
       "vmservice_io": {
-        "uri": "../../../third_party/dart/sdk/lib/_internal/vm/bin/vmservice_io.dart"
+        "uri": "../../../third_party/dart/sdk_nnbd/lib/_internal/vm/bin/vmservice_io.dart"
       }
     }
   }
-}
+}